fix(ci): align Windows generator pins - #4697
januththedev wants to merge 1 commit into
Conversation
|
Januth Nimnal seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account. You have signed the CLA already but the status is still pending? Let us recheck it. |
OK i have Completed the sign in process |
| PROTOC_GEN_GO_VERSION="v1.36.12" | ||
| CONNECT_VERSION="v1.21.0" |
There was a problem hiding this comment.
Lets read these from the makefiles so theres a single source of truth:
# Read versions from makego dependency.
mk_var() {
sed -n "s/^$1 ?= //p" "make/go/$2"
}
PROTOC_VERSION="$(mk_var PROTOC_VERSION dep_protoc.mk)"
PROTOC_GEN_GO_VERSION="$(mk_var PROTOC_GEN_GO_VERSION dep_protoc_gen_go.mk)"
CONNECT_VERSION="$(mk_var CONNECT_VERSION dep_protoc_gen_connect_go.mk)"
for var in PROTOC_VERSION PROTOC_GEN_GO_VERSION CONNECT_VERSION; do
if [ -z "${!var}" ]; then
echo "error: could not read ${var} from make/go" >&2
exit 1
fi
done
|
Good suggestion — and it retires the actual bug rather than just re-syncing the numbers. Pushed One deviation from your snippet: I resolve # Read versions from make/go dependency so this script and the Makefile agree.
# Resolved without changing the working directory: the commands below are
# relative to the repository root.
repo_root="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
mk_var() {
sed -n "s/^$1 ?= //p" "${repo_root}/make/go/$2"
}
PROTOC_VERSION="$(mk_var PROTOC_VERSION dep_protoc.mk)"
PROTOC_GEN_GO_VERSION="$(mk_var PROTOC_GEN_GO_VERSION dep_protoc_gen_go.mk)"
CONNECT_VERSION="$(mk_var CONNECT_VERSION dep_protoc_gen_connect_go.mk)"
for var in PROTOC_VERSION PROTOC_GEN_GO_VERSION CONNECT_VERSION; do
if [ -z "${!var}" ]; then
echo "error: could not read ${var} from make/go" >&2
exit 1
fi
doneI kept your Verification: This supersedes the "update the stale pins" framing of my original description; the substance is now that |
|
@januththedev thanks for looking into this. I think you forgot to push the latest changes. |
18657d5 to
8e7f4d8
Compare
|
You were right — I pushed to the wrong branch. The The change itself is as described above, with the one deviation: |
|
Thanks for raising the issue. Fixed in #4712 |
Fixes #4696.
Align Windows CI with the canonical
protoc-gen-goand Connect generator versions from the make configuration. This removes the duplicated stale pins that caused Windows to test a different toolchain.Validation:
bash -n etc/windows/test.bashpassedgit diff --checkpassed