diff --git a/.gitignore b/.gitignore index 6ad74f09cd1..d5b2f071577 100644 --- a/.gitignore +++ b/.gitignore @@ -174,7 +174,7 @@ index.scip /dev/backcompat/back_compat_migrations.patch # Generated on CI only -.aspect/bazelrc/ci.sourcegraph.bazelrc +.aspect/bazelrc/ci.generated.bazelrc # nix result diff --git a/cmd/executor/ci-should-rebuild.sh b/cmd/executor/ci-should-rebuild.sh old mode 100644 new mode 100755 index 15db7330a34..56b33f086fd --- a/cmd/executor/ci-should-rebuild.sh +++ b/cmd/executor/ci-should-rebuild.sh @@ -13,8 +13,7 @@ set -eu changes_count=$(target-determinator \ --verbose \ --targets \ - //cmd/executor/vm-image:ami.push \ - //cmd/executor/docker-mirror \ + "//cmd/executor/vm-image:ami.build union //cmd/executor/docker-mirror:ami.build" \ HEAD^ \ | wc -l ) diff --git a/dev/ci/bazel-configure.sh b/dev/ci/bazel-configure.sh index 25816def674..709f32f8079 100755 --- a/dev/ci/bazel-configure.sh +++ b/dev/ci/bazel-configure.sh @@ -16,7 +16,7 @@ cd "${BUILD_WORKSPACE_DIRECTORY}" bazel configure if [ "${CI:-}" ]; then - git ls-files --exclude-standard --others | grep -v .aspect/bazelrc/ci.generated.bazelrc | xargs git add --intent-to-add || true + git ls-files --exclude-standard --others | xargs git add --intent-to-add || true diff_file=$(mktemp) trap 'rm -f "${diff_file}"' EXIT