Skip to content

Commit fe0e49e

Browse files
authored
Merge pull request #4498 from vvbandeira/fix-googleapis-protos-pin
fix: pin googleapis-common-protos to repair the dev image build
2 parents 8c06169 + dcfdaf2 commit fe0e49e

2 files changed

Lines changed: 10 additions & 0 deletions

File tree

etc/DockerTag.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ if [[ "$@" == "-dev" ]]; then
88
"./docker/Dockerfile.dev"
99
"./Dockerfile"
1010
"./etc/DependencyInstaller.sh"
11+
"./etc/requirements-common_lock.txt"
1112
"./tools/OpenROAD/etc/DependencyInstaller.sh"
1213
)
1314
cat "${file_list[@]}" | sha256sum | awk '{print substr($1, 1, 6)}'

etc/requirements-common_lock.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,15 @@ google-cloud-pubsub==2.39.1 \
308308
--hash=sha256:b40347cff2df3c4b33747bfdf8a8d74942754c5a6752592acd51a20fec316b56 \
309309
--hash=sha256:dacead1fa0aca7b2015f1acc88d279cd4b12852087908f426fbecf71985940e8
310310
# via -r etc/requirements-common.in
311+
# Hand-added: pip-compile emits only the [grpc] variant below, but
312+
# google-api-core also requires the plain package. pip resolves that as a
313+
# separate requirement, and without a pin here it fetches the newest release
314+
# from the index and then fails the --require-hashes check. Keep both entries
315+
# at the same version when regenerating this file.
316+
googleapis-common-protos==1.75.0 \
317+
--hash=sha256:53a062ff3c32552fbd62c11fe23768b78e4ddf0494d5e5fd97d3f4689c75fbbd \
318+
--hash=sha256:961ed60399c457ceb0ee8f285a84c870aabc9c6a832b9d37bb281b5bebde43ed
319+
# via google-api-core
311320
googleapis-common-protos[grpc]==1.75.0 \
312321
--hash=sha256:53a062ff3c32552fbd62c11fe23768b78e4ddf0494d5e5fd97d3f4689c75fbbd \
313322
--hash=sha256:961ed60399c457ceb0ee8f285a84c870aabc9c6a832b9d37bb281b5bebde43ed

0 commit comments

Comments
 (0)