Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert private linkage branch 1.46.x #236

Merged
merged 2 commits into from
Aug 30, 2022
Merged

Revert private linkage branch 1.46.x #236

merged 2 commits into from
Aug 30, 2022

Conversation

hmaarrfk
Copy link
Contributor

@hmaarrfk hmaarrfk commented Aug 29, 2022 •
edited
Loading

This PR is designed to undo: https://github.com/conda-forge/grpc-cpp-feedstock/pull/213/files and build it for both libprotobuf versions to ensure that unmigrated packages can still build.

@h-vetinari i had this diff locally, to trick the rerender to generate both protobuf versions:

diff --git a/.ci_support/migrations/libprotobuf321.yaml b/.ci_support/migrations/libprotobuf321.yaml
deleted file mode 100644
index 41701fa..0000000
--- a/.ci_support/migrations/libprotobuf321.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-__migrator:
-  build_number: 1
-  kind: version
-  migration_number: 1
-libprotobuf:
-- '3.21'
-migrator_ts: 1661531047.2553904
diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml
index 81df92e..a35248b 100644
--- a/recipe/conda_build_config.yaml
+++ b/recipe/conda_build_config.yaml
@@ -2,3 +2,6 @@ c_compiler_version:    # [linux]
 - '11'                 # [linux]
 cxx_compiler_version:  # [linux]
 - '11'                 # [linux]
+libprotobuf:
+- '3.20'
+- '3.21'

Checklist

  • Used a personal fork of the feedstock to propose changes
  • Bumped the build number (if the version is unchanged)
  • Reset the build number to 0 (if the version changed)
  • Re-rendered with the latest conda-smithy (Use the phrase @conda-forge-admin, please rerender in a comment in this PR for automated rerendering)
  • Ensured the license file is being packaged.

@conda-forge-linter
Copy link

Hi! This is the friendly automated conda-forge-linting service.

I just wanted to let you know that I linted all conda-recipes in your PR (recipe) and found it was in an excellent condition.

@hmaarrfk hmaarrfk changed the title Revert private linkage Revert private linkage branch 1.46.x Aug 29, 2022
@hmaarrfk hmaarrfk mentioned this pull request Aug 29, 2022
Merged
h-vetinari
h-vetinari reviewed Aug 29, 2022
View reviewed changes
Copy link
Member

@h-vetinari h-vetinari left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for this. It's missing only the reversion of the abseil-stuff, otherwise LGTM. Feel free to merge this with (some form of) my suggestion, then I could test the builds tomorrow morning already. 🙃

recipe/meta.yaml Outdated Show resolved Hide resolved
@hmaarrfk
Copy link
Contributor Author

Sorry for the missing credit. patches rebased for easy cherry-picking.

@h-vetinari h-vetinari added the automerge Merge the PR when CI passes label Aug 29, 2022
@h-vetinari
Copy link
Member

For completeness, the reason I think the reversion of the patches is not necessary is that they're IMO not wrong, "just" incomplete (i.e. for pkgconfig) - I'll have to reintroduce them in any case (hopefully together with some tests), but as I said I'm fine with reverting so we can move forward. :)

@github-actions
Copy link
Contributor

github-actions bot commented Aug 29, 2022 •
edited
Loading

Hi! This is the friendly conda-forge automerge bot!

I considered the following status checks when analyzing this PR:

  • linter: passed
  • azure: passed

Thus the PR was passing and merged! Have a great day!

@hmaarrfk
Copy link
Contributor Author

this failure is fun.

@h-vetinari
Copy link
Member

this failure is fun.

I've seen flakiness on osx builds to that effect in recent times. Should be fixable by a restart 🤞

@github-actions github-actions bot merged commit 8b95869 into conda-forge:1.46.x Aug 30, 2022
@h-vetinari
Copy link
Member

This worked in conda-forge/cpp-opentelemetry-sdk-feedstock#26

@h-vetinari h-vetinari mentioned this pull request Aug 31, 2022
Closed
h-vetinari added a commit to h-vetinari/grpc-cpp-feedstock that referenced this pull request Sep 4, 2022
@h-vetinari
Rebuild for both current protobufs
341de4f 
To keep some sanity while all these migrations are
still ongoing. Need to trick conda smithy as follows, c.f.
conda-forge#236 (comment)

```
diff --git a/.ci_support/migrations/libprotobuf321.yaml b/.ci_support/migrations/libprotobuf321.yaml
deleted file mode 100644
index 41701fa..0000000
--- a/.ci_support/migrations/libprotobuf321.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-__migrator:
-  build_number: 1
-  kind: version
-  migration_number: 1
-libprotobuf:
-- '3.21'
-migrator_ts: 1661531047.2553904
diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml
index 81df92e..b022bac 100644
--- a/recipe/conda_build_config.yaml
+++ b/recipe/conda_build_config.yaml
@@ -2,3 +2,7 @@ c_compiler_version:    # [linux]
 - '11'                 # [linux]
 cxx_compiler_version:  # [linux]
 - '11'                 # [linux]
+libprotobuf:
+- '3.20'
+- '3.21'
```

and then rerender:

MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.1, and conda-forge-pinning 2022.09.04.11.55.37
h-vetinari added a commit to h-vetinari/grpc-cpp-feedstock that referenced this pull request Sep 4, 2022
@h-vetinari
Rebuild for both current protobufs
fbeac3d 
To keep some sanity while all these migrations are
still ongoing. Need to trick conda smithy as follows, c.f.
conda-forge#236 (comment)

```
diff --git a/.ci_support/migrations/libprotobuf321.yaml b/.ci_support/migrations/libprotobuf321.yaml
deleted file mode 100644
index 41701fa..0000000
--- a/.ci_support/migrations/libprotobuf321.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-__migrator:
-  build_number: 1
-  kind: version
-  migration_number: 1
-libprotobuf:
-- '3.21'
-migrator_ts: 1661531047.2553904
diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml
index 81df92e..b022bac 100644
--- a/recipe/conda_build_config.yaml
+++ b/recipe/conda_build_config.yaml
@@ -2,3 +2,7 @@ c_compiler_version:    # [linux]
 - '11'                 # [linux]
 cxx_compiler_version:  # [linux]
 - '11'                 # [linux]
+libprotobuf:
+- '3.20'
+- '3.21'
```

and then rerender:

MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.1, and conda-forge-pinning 2022.09.04.11.55.37
h-vetinari added a commit to h-vetinari/grpc-cpp-feedstock that referenced this pull request Sep 4, 2022
@h-vetinari
Rebuild for both current protobufs
276cef6 
To keep some sanity while all these migrations are
still ongoing. Need to trick conda smithy as follows, c.f.
conda-forge#236 (comment)

```
diff --git a/.ci_support/migrations/libprotobuf321.yaml b/.ci_support/migrations/libprotobuf321.yaml
deleted file mode 100644
index 41701fa..0000000
--- a/.ci_support/migrations/libprotobuf321.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-__migrator:
-  build_number: 1
-  kind: version
-  migration_number: 1
-libprotobuf:
-- '3.21'
-migrator_ts: 1661531047.2553904
diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml
index 81df92e..b022bac 100644
--- a/recipe/conda_build_config.yaml
+++ b/recipe/conda_build_config.yaml
@@ -2,3 +2,7 @@ c_compiler_version:    # [linux]
 - '11'                 # [linux]
 cxx_compiler_version:  # [linux]
 - '11'                 # [linux]
+libprotobuf:
+- '3.20'
+- '3.21'
```

and then rerender:

MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.1, and conda-forge-pinning 2022.09.04.11.55.37
h-vetinari added a commit to h-vetinari/grpc-cpp-feedstock that referenced this pull request Sep 4, 2022
@h-vetinari
Rebuild for both current protobufs
324b0ba 
To keep some sanity while all these migrations are
still ongoing. Need to trick conda smithy as follows, c.f.
conda-forge#236 (comment)

```
diff --git a/.ci_support/migrations/libprotobuf321.yaml b/.ci_support/migrations/libprotobuf321.yaml
deleted file mode 100644
index 41701fa..0000000
--- a/.ci_support/migrations/libprotobuf321.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-__migrator:
-  build_number: 1
-  kind: version
-  migration_number: 1
-libprotobuf:
-- '3.21'
-migrator_ts: 1661531047.2553904
diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml
index 81df92e..b022bac 100644
--- a/recipe/conda_build_config.yaml
+++ b/recipe/conda_build_config.yaml
@@ -2,3 +2,7 @@ c_compiler_version:    # [linux]
 - '11'                 # [linux]
 cxx_compiler_version:  # [linux]
 - '11'                 # [linux]
+libprotobuf:
+- '3.20'
+- '3.21'
```

and then rerender:

MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.1, and conda-forge-pinning 2022.09.04.11.55.37
h-vetinari added a commit to h-vetinari/grpc-cpp-feedstock that referenced this pull request Sep 4, 2022
@h-vetinari
Rebuild for both current protobufs
953e912 
To keep some sanity while all these migrations are
still ongoing. Need to trick conda smithy as follows, c.f.
conda-forge#236 (comment)

```
diff --git a/.ci_support/migrations/libprotobuf321.yaml b/.ci_support/migrations/libprotobuf321.yaml
deleted file mode 100644
index 41701fa..0000000
--- a/.ci_support/migrations/libprotobuf321.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-__migrator:
-  build_number: 1
-  kind: version
-  migration_number: 1
-libprotobuf:
-- '3.21'
-migrator_ts: 1661531047.2553904
diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml
index 81df92e..b022bac 100644
--- a/recipe/conda_build_config.yaml
+++ b/recipe/conda_build_config.yaml
@@ -2,3 +2,7 @@ c_compiler_version:    # [linux]
 - '11'                 # [linux]
 cxx_compiler_version:  # [linux]
 - '11'                 # [linux]
+libprotobuf:
+- '3.20'
+- '3.21'
```

and then rerender:

MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.1, and conda-forge-pinning 2022.09.04.11.55.37
@h-vetinari h-vetinari mentioned this pull request Sep 12, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@h-vetinari h-vetinari h-vetinari approved these changes

@mariusvniekerk mariusvniekerk Awaiting requested review from mariusvniekerk mariusvniekerk is a code owner

@pitrou pitrou Awaiting requested review from pitrou pitrou is a code owner

@wesm wesm Awaiting requested review from wesm wesm is a code owner

@xhochy xhochy Awaiting requested review from xhochy xhochy is a code owner

Assignees
No one assigned
Labels
automerge Merge the PR when CI passes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@hmaarrfk @conda-forge-linter @h-vetinari