diff options
author | Jie Luo <jieluo@google.com> | 2022-12-22 12:59:55 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-22 12:59:55 -0800 |
commit | a677d9033f00e16adf172611b99071f99e1fd782 (patch) | |
tree | dcc71568e0ee9eeeaacfa0ac93ae03f594a7aa18 | |
parent | c1e53fb25045abd4bd4e73e7bf9a9a744044718a (diff) | |
download | protobuf-a677d9033f00e16adf172611b99071f99e1fd782.tar.gz |
Add use_bazel.sh 5.1.1 to ruby/python build (#11389)
pin Bazel version to an older stable one (5.1.1)
-rwxr-xr-x | kokoro/release/python/macos/build_artifacts.sh | 3 | ||||
-rw-r--r-- | kokoro/release/python/macos/continuous.cfg | 2 | ||||
-rw-r--r-- | kokoro/release/python/macos/presubmit.cfg | 2 | ||||
-rw-r--r-- | kokoro/release/python/macos/release.cfg | 2 | ||||
-rwxr-xr-x | kokoro/release/ruby/macos/build_artifacts.sh | 5 | ||||
-rw-r--r-- | kokoro/release/ruby/macos/continuous.cfg | 2 | ||||
-rw-r--r-- | kokoro/release/ruby/macos/presubmit.cfg | 2 | ||||
-rw-r--r-- | kokoro/release/ruby/macos/release.cfg | 2 |
8 files changed, 19 insertions, 1 deletions
diff --git a/kokoro/release/python/macos/build_artifacts.sh b/kokoro/release/python/macos/build_artifacts.sh index d79d2f6b4..15ac5dc89 100755 --- a/kokoro/release/python/macos/build_artifacts.sh +++ b/kokoro/release/python/macos/build_artifacts.sh @@ -8,6 +8,9 @@ brew uninstall -f protobuf # change to repo root pushd $(dirname $0)/../../../.. +chmod ugo+x ${KOKORO_GFILE_DIR}/use_bazel.sh +${KOKORO_GFILE_DIR}/use_bazel.sh 5.1.1 + # Create stage dir ORIGINAL_DIR=`pwd` pushd .. diff --git a/kokoro/release/python/macos/continuous.cfg b/kokoro/release/python/macos/continuous.cfg index 85cf81b50..95f32358e 100644 --- a/kokoro/release/python/macos/continuous.cfg +++ b/kokoro/release/python/macos/continuous.cfg @@ -6,3 +6,5 @@ action { regex: "github/protobuf/artifacts/**" } } + +gfile_resources: "/google_src/files/head/depot/google3/devtools/kokoro/vanadium/linux_scripts/usr/local/bin/use_bazel.sh" diff --git a/kokoro/release/python/macos/presubmit.cfg b/kokoro/release/python/macos/presubmit.cfg index 85cf81b50..95f32358e 100644 --- a/kokoro/release/python/macos/presubmit.cfg +++ b/kokoro/release/python/macos/presubmit.cfg @@ -6,3 +6,5 @@ action { regex: "github/protobuf/artifacts/**" } } + +gfile_resources: "/google_src/files/head/depot/google3/devtools/kokoro/vanadium/linux_scripts/usr/local/bin/use_bazel.sh" diff --git a/kokoro/release/python/macos/release.cfg b/kokoro/release/python/macos/release.cfg index 85cf81b50..95f32358e 100644 --- a/kokoro/release/python/macos/release.cfg +++ b/kokoro/release/python/macos/release.cfg @@ -6,3 +6,5 @@ action { regex: "github/protobuf/artifacts/**" } } + +gfile_resources: "/google_src/files/head/depot/google3/devtools/kokoro/vanadium/linux_scripts/usr/local/bin/use_bazel.sh" diff --git a/kokoro/release/ruby/macos/build_artifacts.sh b/kokoro/release/ruby/macos/build_artifacts.sh index a109d45b6..2d3424b07 100755 --- a/kokoro/release/ruby/macos/build_artifacts.sh +++ b/kokoro/release/ruby/macos/build_artifacts.sh @@ -1,10 +1,13 @@ #!/bin/bash set -ex - + # change to repo root cd $(dirname $0)/../../../.. +chmod ugo+x ${KOKORO_GFILE_DIR}/use_bazel.sh +${KOKORO_GFILE_DIR}/use_bazel.sh 5.1.1 + # all artifacts come here mkdir artifacts export ARTIFACT_DIR=$(pwd)/artifacts diff --git a/kokoro/release/ruby/macos/continuous.cfg b/kokoro/release/ruby/macos/continuous.cfg index cb1c08bb8..6b285cd3d 100644 --- a/kokoro/release/ruby/macos/continuous.cfg +++ b/kokoro/release/ruby/macos/continuous.cfg @@ -6,3 +6,5 @@ action { regex: "github/protobuf/artifacts/**" } } + +gfile_resources: "/google_src/files/head/depot/google3/devtools/kokoro/vanadium/linux_scripts/usr/local/bin/use_bazel.sh" diff --git a/kokoro/release/ruby/macos/presubmit.cfg b/kokoro/release/ruby/macos/presubmit.cfg index cb1c08bb8..6b285cd3d 100644 --- a/kokoro/release/ruby/macos/presubmit.cfg +++ b/kokoro/release/ruby/macos/presubmit.cfg @@ -6,3 +6,5 @@ action { regex: "github/protobuf/artifacts/**" } } + +gfile_resources: "/google_src/files/head/depot/google3/devtools/kokoro/vanadium/linux_scripts/usr/local/bin/use_bazel.sh" diff --git a/kokoro/release/ruby/macos/release.cfg b/kokoro/release/ruby/macos/release.cfg index cb1c08bb8..6b285cd3d 100644 --- a/kokoro/release/ruby/macos/release.cfg +++ b/kokoro/release/ruby/macos/release.cfg @@ -6,3 +6,5 @@ action { regex: "github/protobuf/artifacts/**" } } + +gfile_resources: "/google_src/files/head/depot/google3/devtools/kokoro/vanadium/linux_scripts/usr/local/bin/use_bazel.sh" |