From 9c6778ace801b3a445907d7e5902308d45d42689 Mon Sep 17 00:00:00 2001 From: Matt Clarkson Date: Fri, 30 Aug 2024 13:59:21 +0100 Subject: [PATCH 1/5] chore: correct toolchain type for action --- ape/assimilate/rule.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ape/assimilate/rule.bzl b/ape/assimilate/rule.bzl index 03b3f08f..b5e8916b 100644 --- a/ape/assimilate/rule.bzl +++ b/ape/assimilate/rule.bzl @@ -104,7 +104,7 @@ def _assimilate(ctx, executable): arguments = [args], mnemonic = "ApeAssimilate", progress_message = "assimilating %{input}", - toolchain = "//ape/toolchain/assimilate:type", + toolchain = "//ape/toolchain/ape:type", ) return ctx.runfiles([executable]) -- GitLab From e7dc024d202a976c275066ce245dc54337e156f2 Mon Sep 17 00:00:00 2001 From: Matt Clarkson Date: Fri, 30 Aug 2024 15:05:54 +0100 Subject: [PATCH 2/5] chore: more relative paths to normal run commands --- .bazelrc | 3 +++ .bazelrc.ci | 3 --- e2e/.bazelrc | 3 +++ e2e/.bazelrc.ci | 3 --- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.bazelrc b/.bazelrc index caf256cf..31d7aa52 100644 --- a/.bazelrc +++ b/.bazelrc @@ -10,5 +10,8 @@ build --nolegacy_external_runfiles # Avoid building all targets when testing test --build_tests_only +# Print relative paths where possible to reduce noise +common --attempt_to_print_relative_paths + # User-specific .bazelrc try-import %workspace%/.bazelrc.user diff --git a/.bazelrc.ci b/.bazelrc.ci index 045e1ab1..4de94ccb 100644 --- a/.bazelrc.ci +++ b/.bazelrc.ci @@ -16,9 +16,6 @@ common --show_timestamps # Do not wrap any output common --terminal_columns=0 -# Print relative paths where possible to reduce noise -common --attempt_to_print_relative_paths - # Output as much information in the CI log about failures as possible build --verbose_failures diff --git a/e2e/.bazelrc b/e2e/.bazelrc index caf256cf..31d7aa52 100644 --- a/e2e/.bazelrc +++ b/e2e/.bazelrc @@ -10,5 +10,8 @@ build --nolegacy_external_runfiles # Avoid building all targets when testing test --build_tests_only +# Print relative paths where possible to reduce noise +common --attempt_to_print_relative_paths + # User-specific .bazelrc try-import %workspace%/.bazelrc.user diff --git a/e2e/.bazelrc.ci b/e2e/.bazelrc.ci index 045e1ab1..4de94ccb 100644 --- a/e2e/.bazelrc.ci +++ b/e2e/.bazelrc.ci @@ -16,9 +16,6 @@ common --show_timestamps # Do not wrap any output common --terminal_columns=0 -# Print relative paths where possible to reduce noise -common --attempt_to_print_relative_paths - # Output as much information in the CI log about failures as possible build --verbose_failures -- GitLab From 41f382942883a88ea824d516068c49e709db8d27 Mon Sep 17 00:00:00 2001 From: Matt Clarkson Date: Fri, 30 Aug 2024 15:06:08 +0100 Subject: [PATCH 3/5] ci: validate lockfile --- .bazelrc.ci | 3 +++ e2e/.bazelrc.ci | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.bazelrc.ci b/.bazelrc.ci index 4de94ccb..038267c2 100644 --- a/.bazelrc.ci +++ b/.bazelrc.ci @@ -25,6 +25,9 @@ test --test_output=errors # Output as much information when a test exceeds a timeout test --test_verbose_timeout_warnings +# Validate that the lockfile is correct +common --lockfile_mode=error + # These locations are cached on the CI build:local --disk_cache=${CI_PROJECT_DIR}/.cache/bazel/disk build:local --repository_cache=${CI_PROJECT_DIR}/.cache/bazel/repo diff --git a/e2e/.bazelrc.ci b/e2e/.bazelrc.ci index 4de94ccb..038267c2 100644 --- a/e2e/.bazelrc.ci +++ b/e2e/.bazelrc.ci @@ -25,6 +25,9 @@ test --test_output=errors # Output as much information when a test exceeds a timeout test --test_verbose_timeout_warnings +# Validate that the lockfile is correct +common --lockfile_mode=error + # These locations are cached on the CI build:local --disk_cache=${CI_PROJECT_DIR}/.cache/bazel/disk build:local --repository_cache=${CI_PROJECT_DIR}/.cache/bazel/repo -- GitLab From 66a88fc36804e5d097e115960c32aad6edf67b8d Mon Sep 17 00:00:00 2001 From: Matt Clarkson Date: Fri, 30 Aug 2024 15:06:24 +0100 Subject: [PATCH 4/5] ci: upgrade to `1.0.0-beta.4` component --- .gitlab-ci.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 33095a53..331b5320 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ include: - - component: "${CI_SERVER_HOST}/ci/component/bazelisk/bazelisk@v1.0.0-beta.3" + - component: "${CI_SERVER_HOST}/ci/component/bazelisk/bazelisk@v1.0.0-beta.4" inputs: variables: | CI_PROJECT_DIR @@ -21,6 +21,12 @@ default: test: extends: .bazelisk + cache: + - !reference [.bazelisk, cache] + - key: "bazel-cache-${CI_PROJECT_ID}" + paths: + - ".cache/bazel/disk" + - ".cache/bazel/repo" parallel: matrix: - ROOT: -- GitLab From 8f696d8fde1d160141587abd58061e4ce7ac529a Mon Sep 17 00:00:00 2001 From: Matt Clarkson Date: Fri, 30 Aug 2024 15:06:35 +0100 Subject: [PATCH 5/5] ci: describe remote executor platforms --- .bazelrc.ci | 4 ++-- e2e/.bazelrc.ci | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.bazelrc.ci b/.bazelrc.ci index 038267c2..679a169b 100644 --- a/.bazelrc.ci +++ b/.bazelrc.ci @@ -60,5 +60,5 @@ build:remote --experimental_profile_include_primary_output # Eliminate duplicate references in the Build Event Stream build:remote --nolegacy_important_outputs -# TODO: remove this when `bazel/ape` binaries work on remote execution `arm64` instances -build:remote --host_platform=@toolchain_utils//toolchain/platform:amd64-linux-gnu +# Describe remote executors +build:remote --extra_execution_platforms=@toolchain_utils//toolchain/platform:amd64-linux-gnu diff --git a/e2e/.bazelrc.ci b/e2e/.bazelrc.ci index 038267c2..679a169b 100644 --- a/e2e/.bazelrc.ci +++ b/e2e/.bazelrc.ci @@ -60,5 +60,5 @@ build:remote --experimental_profile_include_primary_output # Eliminate duplicate references in the Build Event Stream build:remote --nolegacy_important_outputs -# TODO: remove this when `bazel/ape` binaries work on remote execution `arm64` instances -build:remote --host_platform=@toolchain_utils//toolchain/platform:amd64-linux-gnu +# Describe remote executors +build:remote --extra_execution_platforms=@toolchain_utils//toolchain/platform:amd64-linux-gnu -- GitLab