Merge pull request #17525 from protocolbuffers/fix-25.x-staleness

backport staleness changes to 25.x
protocolbuffers · Jul 18, 2024 · 6eb8b00 · 6eb8b00
2 parents 314fc8b + d491c4c
commit 6eb8b00
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/.github/workflows/staleness_check.yml b/.github/workflows/staleness_check.yml
@@ -40,7 +40,7 @@ jobs:
 
       - name: Run all staleness tests
         env:
-          USE_BAZEL_VERSION: '6.3.0'
+          USE_BAZEL_VERSION: '6.3.2'
         # Run all tests if either of the following is true, otherwise simply run the query to make
         # sure it continues to work:
         # 1) If this is not a commit-based run it means it's scheduled or manually dispatched. In

diff --git a/regenerate_stale_files.sh b/regenerate_stale_files.sh
@@ -12,18 +12,24 @@ cd $(dirname -- "$0")
 
 readonly BazelBin="${BAZEL:-bazel} ${BAZEL_STARTUP_FLAGS}"
 
+STALENESS_TESTS=(
+  "src:cmake_lists_staleness_test"
+  "src/google/protobuf:well_known_types_staleness_test"
+  "objectivec:well_known_types_staleness_test"
+  "php:test_amalgamation_staleness"
+  "ruby/ext/google/protobuf_c:test_amalgamation_staleness"
+  "upb/cmake:test_generated_files"
+)
+
 # Run and fix all staleness tests.
-${BazelBin} test src:cmake_lists_staleness_test "$@" || ./bazel-bin/src/cmake_lists_staleness_test --fix
-${BazelBin} test src/google/protobuf:well_known_types_staleness_test "$@" || ./bazel-bin/src/google/protobuf/well_known_types_staleness_test --fix
-${BazelBin} test objectivec:well_known_types_staleness_test "$@" || ./bazel-bin/objectivec/well_known_types_staleness_test --fix
-${BazelBin} test php:test_amalgamation_staleness "$@" || ./bazel-bin/php/test_amalgamation_staleness --fix
-${BazelBin} test ruby/ext/google/protobuf_c:test_amalgamation_staleness "$@" || ./bazel-bin/ruby/ext/google/protobuf_c/test_amalgamation_staleness --fix
-${BazelBin} test upb/cmake:test_generated_files "$@" || ./bazel-bin/upb/cmake/test_generated_files --fix
+for test in ${STALENESS_TESTS[@]}; do
+  ${BazelBin} test $test "$@" || ./bazel-bin/${test%%:*}/${test#*:} --fix
+done
 
 # Generate C# code.
 # This doesn't currently have Bazel staleness tests, but there's an existing
 # shell script that generates everything required. The output files are stable,
-# so just regenerating in place should be harmless. 
+# so just regenerating in place should be harmless.
 ${BazelBin} build src/google/protobuf/compiler:protoc "$@"
 (export PROTOC=$PWD/bazel-bin/protoc && cd csharp && ./generate_protos.sh)