Compare revisions

Matthew Clarkson · Matthew Clarkson · Matthew Clarkson · Matthew Clarkson · Bot · d7431cf0
--- a/.bazelrc.ci
+++ b/.bazelrc.ci
@@ -16,6 +16,9 @@ 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

@@ -26,5 +29,36 @@ test --test_output=errors
 test --test_verbose_timeout_warnings

 # These locations are cached on the CI
-build --disk_cache=${CI_PROJECT_DIR}/.cache/bazel/disk
-build --repository_cache=${CI_PROJECT_DIR}/.cache/bazel/repo
+build:local --disk_cache=${CI_PROJECT_DIR}/.cache/bazel/disk
+build:local --repository_cache=${CI_PROJECT_DIR}/.cache/bazel/repo
+
+# Use remote cache/execution for our builds
+build:remote --remote_executor=${CI_REMOTE_EXECUTOR}
+build:remote --remote_cache=${CI_REMOTE_CACHE}
+build:remote --remote_timeout=3600
+build:remote --remote_header=${CI_REMOTE_HEADER}
+build:remote --experimental_remote_cache_compression
+build:remote --jobs=${CI_REMOTE_JOBS}
+
+# Upload results to the Build Event Service
+build:remote --bes_results_url=${CI_BES_RESULTS_URL}
+build:remote --bes_backend=${CI_BES_BACKEND}
+
+# Add build metadata
+build:remote --build_metadata=REPO_URL=${CI_PROJECT_URL}
+build:remote --build_metadata=BRANCH_NAME=${CI_COMMIT_REF_NAME}
+build:remote --build_metadata=COMMIT_SHA=${CI_COMMIT_SHA}
+build:remote --build_metadata=HOST=${CI_SERVER_HOST}
+build:remote --build_metadata=ROLE=CI
+build:remote --build_metadata=USER=gitlab-ci
+
+# Provide detailed timing information to the remote executor
+build:remote --noslim_profile
+build:remote --experimental_profile_include_target_label
+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
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
 include:
-  - component: "${CI_SERVER_HOST}/ci/component/bazelisk/bazelisk@v1.0.0-beta.2"
+  - component: "${CI_SERVER_HOST}/ci/component/bazelisk/bazelisk@v1.0.0-beta.3"
+    inputs:
+      variables: |
+        CI_PROJECT_DIR
+        CI_PROJECT_ID
+        CI_REMOTE_EXECUTOR
+        CI_REMOTE_CACHE
+        CI_REMOTE_HEADER
+        CI_REMOTE_JOBS
+        CI_BES_RESULTS_URL
+        CI_BES_BACKEND
+        CI_PROJECT_URL
+        CI_COMMIT_REF_NAME
+        CI_COMMIT_SHA
+        CI_SERVER_HOST

 default:
  tags:
@@ -10,8 +24,13 @@ test:
  parallel:
    matrix:
      - ROOT:
-          - .
-          - e2e
+        - .
+        - e2e
+        CONFIG:
+        - local
+        - remote
+  script:
+    - cd "${ROOT}"; bazelisk test --config="${CONFIG}" //...

 # TODO: switch this out for `rules_semantic_release`
 semantic-release:

--- a/CHANGELOG.md
+++ b/CHANGELOG.md
+# [1.0.0-beta.2](https://git.gitlab.arm.com/bazel/rules_diff/compare/v1.0.0-beta.1...v1.0.0-beta.2) (2024-05-02)
+
+### Bug Fixes
+
+- **ape:** upgrade to support remote execution ([5af242c](https://git.gitlab.arm.com/bazel/rules_diff/commit/5af242c6a55d7f4db231cd1e208d987df8c580c4))
+
 # 1.0.0-beta.1 (2024-04-25)

 ### Bug Fixes

--- a/MODULE.bazel
+++ b/MODULE.bazel
 module(
    name = "rules_diff",
-    version = "1.0.0-beta.1",
+    version = "1.0.0-beta.2",
    bazel_compatibility = [
        ">=7.0.0",
    ],
@@ -8,7 +8,7 @@ module(
 )

 bazel_dep(name = "toolchain_utils", version = "1.0.0-beta.6")
-bazel_dep(name = "ape", version = "1.0.0-beta.2")
+bazel_dep(name = "ape", version = "1.0.0-beta.4")

 export = use_extension("@toolchain_utils//toolchain/export:defs.bzl", "toolchain_export")


--- a/MODULE.bazel.lock
+++ b/MODULE.bazel.lock
--- a/diff/toolchain/cmp/BUILD.bazel
+++ b/diff/toolchain/cmp/BUILD.bazel
@@ -8,7 +8,7 @@ toolchain_type(

 ape_toolchain(
    name = "ape",
-    toolchain = "@ape-cmp//:cmp",
+    toolchain = "@ape//:cmp",
    toolchain_type = ":type",
 )


--- a/diff/toolchain/diff/BUILD.bazel
+++ b/diff/toolchain/diff/BUILD.bazel
@@ -8,7 +8,7 @@ toolchain_type(

 ape_toolchain(
    name = "ape",
-    toolchain = "@ape-diff//:diff",
+    toolchain = "@ape//:diff",
    toolchain_type = ":type",
 )


--- a/diff/toolchain/diff3/BUILD.bazel
+++ b/diff/toolchain/diff3/BUILD.bazel
@@ -8,7 +8,7 @@ toolchain_type(

 ape_toolchain(
    name = "ape",
-    toolchain = "@ape-diff3//:diff3",
+    toolchain = "@ape//:diff3",
    toolchain_type = ":type",
 )


--- a/diff/toolchain/sdiff/BUILD.bazel
+++ b/diff/toolchain/sdiff/BUILD.bazel
@@ -8,7 +8,7 @@ toolchain_type(

 ape_toolchain(
    name = "ape",
-    toolchain = "@ape-sdiff//:sdiff",
+    toolchain = "@ape//:sdiff",
    toolchain_type = ":type",
 )


--- a/e2e/.bazelrc.ci
+++ b/e2e/.bazelrc.ci
@@ -16,6 +16,9 @@ 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

@@ -26,5 +29,36 @@ test --test_output=errors
 test --test_verbose_timeout_warnings

 # These locations are cached on the CI
-build --disk_cache=${CI_PROJECT_DIR}/.cache/bazel/disk
-build --repository_cache=${CI_PROJECT_DIR}/.cache/bazel/repo
+build:local --disk_cache=${CI_PROJECT_DIR}/.cache/bazel/disk
+build:local --repository_cache=${CI_PROJECT_DIR}/.cache/bazel/repo
+
+# Use remote cache/execution for our builds
+build:remote --remote_executor=${CI_REMOTE_EXECUTOR}
+build:remote --remote_cache=${CI_REMOTE_CACHE}
+build:remote --remote_timeout=3600
+build:remote --remote_header=${CI_REMOTE_HEADER}
+build:remote --experimental_remote_cache_compression
+build:remote --jobs=${CI_REMOTE_JOBS}
+
+# Upload results to the Build Event Service
+build:remote --bes_results_url=${CI_BES_RESULTS_URL}
+build:remote --bes_backend=${CI_BES_BACKEND}
+
+# Add build metadata
+build:remote --build_metadata=REPO_URL=${CI_PROJECT_URL}
+build:remote --build_metadata=BRANCH_NAME=${CI_COMMIT_REF_NAME}
+build:remote --build_metadata=COMMIT_SHA=${CI_COMMIT_SHA}
+build:remote --build_metadata=HOST=${CI_SERVER_HOST}
+build:remote --build_metadata=ROLE=CI
+build:remote --build_metadata=USER=gitlab-ci
+
+# Provide detailed timing information to the remote executor
+build:remote --noslim_profile
+build:remote --experimental_profile_include_target_label
+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
--- a/e2e/MODULE.bazel.lock
+++ b/e2e/MODULE.bazel.lock
No results found