Revert private linkage branch 1.46.x#236
Merged
github-actions[bot] merged 2 commits intoconda-forge:1.46.xfrom Aug 30, 2022
Merged
Revert private linkage branch 1.46.x#236github-actions[bot] merged 2 commits intoconda-forge:1.46.xfrom
github-actions[bot] merged 2 commits intoconda-forge:1.46.xfrom
Conversation
|
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 ( |
4cecb3e to
e03ad41
Compare
h-vetinari
reviewed
Aug 29, 2022
Member
h-vetinari
left a comment
There was a problem hiding this comment.
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. 🙃
…nda-forge-pinning 2022.08.29.19.12.47
b3d5138 to
a709786
Compare
Contributor
Author
|
Sorry for the missing credit. patches rebased for easy cherry-picking. |
h-vetinari
approved these changes
Aug 29, 2022
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. :) |
Contributor
|
Hi! This is the friendly conda-forge automerge bot! I considered the following status checks when analyzing this PR:
Thus the PR was passing and merged! Have a great day! |
Contributor
Author
|
this failure is fun. |
Member
I've seen flakiness on osx builds to that effect in recent times. Should be fixable by a restart 🤞 |
Member
|
This worked in conda-forge/cpp-opentelemetry-sdk-feedstock#26 |
h-vetinari
added a commit
to h-vetinari/grpc-cpp-feedstock
that referenced
this pull request
Sep 4, 2022
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
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
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
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
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
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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:
Checklist
0(if the version changed)conda-smithy(Use the phrase@conda-forge-admin, please rerenderin a comment in this PR for automated rerendering)