From be37c114064fe0a001a50a388a13ed79b57d0bc0 Mon Sep 17 00:00:00 2001 From: Paul Gschwendtner Date: Sun, 20 Feb 2022 11:48:03 +0100 Subject: [PATCH] ci: fix stamping for builds performed in CI Fixes the stamping for snapshot builds and the artifact deployment job. --- .circleci/config.yml | 5 +++-- scripts/bazel/setup-remote-execution.sh | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9642727ceb4f..24dd23d38532 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -67,8 +67,9 @@ var_11: &yarn_install_loose_lockfile var_12: &setup_bazel_ci_config run: name: "Setting up Bazel configuration for CI" - command: | - echo "import %workspace%/.circleci/bazel.rc" >> ./.bazelrc + # Note: We add the remote config flag to the user bazelrc file that is not tracked + # by Git. This is necessary to avoid stamping builds with `.with-local-changes`. + command: echo "import %workspace%/.circleci/bazel.rc" >> ./.bazelrc.user # Attaches the release output which has been stored in the workspace to the current job. # https://circleci.com/docs/2.0/workflows/#using-workspaces-to-share-data-among-jobs diff --git a/scripts/bazel/setup-remote-execution.sh b/scripts/bazel/setup-remote-execution.sh index ebf6ed1d9d03..87068416c12b 100755 --- a/scripts/bazel/setup-remote-execution.sh +++ b/scripts/bazel/setup-remote-execution.sh @@ -26,4 +26,6 @@ elif [[ ! -z "${GITHUB_ENV}" ]]; then fi # Update the project Bazel configuration to always use remote execution. -echo "build --config=remote" >> .bazelrc +# Note: We add the remote config flag to the user bazelrc file that is not tracked +# by Git. This is necessary to avoid stamping builds with `.with-local-changes`. +echo "build --config=remote" >> .bazelrc.user