Compare revisions

Matthew Clarkson · Matthew Clarkson · Matthew Clarkson · Matthew Clarkson · Matthew Clarkson · Matthew Clarkson
--- a/.bazelrc
+++ b/.bazelrc
+# Enable `bzlmod`
+common --enable_bzlmod
+
 # Build cache
 build --experimental_guard_against_concurrent_changes

@@ -10,5 +13,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
--- a/.bazelrc.ci
+++ b/.bazelrc.ci
@@ -29,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/BUILD.bazel
+++ b/BUILD.bazel
-alias(
-    name = "cli",
-    actual = "//curl/toolchain/cli:resolved",
-    visibility = ["//visibility:public"],
-)
-
 alias(
    name = "curl",
-    actual = ":cli",
+    actual = "//curl/toolchain/curl:resolved",
    visibility = ["//visibility:public"],
 )
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
+# [1.0.0-alpha.7](https://git.gitlab.arm.com/bazel/rules_curl/compare/v1.0.0-alpha.6...v1.0.0-alpha.7) (2024-05-22)
+
+### Bug Fixes
+
+- only register APE toolchains for correct platforms ([287764f](https://git.gitlab.arm.com/bazel/rules_curl/commit/287764f8f217f9fb4791e1723bb411e0ec38e5c1))
+- upgrade to use `toolchain_info` and remote execution friendly `ape` targets ([02037fd](https://git.gitlab.arm.com/bazel/rules_curl/commit/02037fd7e7337ffe1d35890d3eb617c97df4d109))
+
+### Code Refactoring
+
+- remove `cli` toolchain ([af7bea4](https://git.gitlab.arm.com/bazel/rules_curl/commit/af7bea48667b2f2645ddb13d9e3b3017c83f136f))
+
+### BREAKING CHANGES
+
+- The `@rules_curl//curl/toolchain/cli:type` has been removed
+  in favour of `@rules_curl//curl/toolchain/curl:`type`.
+
+`@rules_curl//:cli` has been removed in favour of `@rules_curl//:curl`.
+
 # [1.0.0-alpha.6](https://git.gitlab.arm.com/bazel/rules_curl/compare/v1.0.0-alpha.5...v1.0.0-alpha.6) (2024-02-15)

 ### Bug Fixes

--- a/MODULE.bazel
+++ b/MODULE.bazel
 module(
    name = "rules_curl",
-    version = "1.0.0-alpha.6",
+    version = "1.0.0-alpha.7",
    bazel_compatibility = [
        ">=7.0.0",
    ],
    compatibility_level = 1,
 )

-bazel_dep(name = "toolchain_utils", version = "1.0.0-beta.1")
-bazel_dep(name = "ape", version = "1.0.0-alpha.1")
+bazel_dep(name = "toolchain_utils", version = "1.0.0-beta.9")
+bazel_dep(name = "ape", version = "1.0.0-beta.6")

 export = use_extension("@toolchain_utils//toolchain/export:defs.bzl", "toolchain_export")
 use_repo(export, "ape-curl")
@@ -22,7 +22,7 @@ resolved = use_repo_rule("@toolchain_utils//toolchain/resolved:defs.bzl", "toolc

 resolved(
    name = "resolved-curl",
-    toolchain_type = "//curl/toolchain/cli:type",
+    toolchain_type = "//curl/toolchain/curl:type",
 )

-register_toolchains("//curl/toolchain/cli:all")
+register_toolchains("//curl/toolchain/...")
--- a/MODULE.bazel.lock
+++ b/MODULE.bazel.lock
--- a/curl/toolchain/cli/BUILD.bazel
+++ b/curl/toolchain/cli/BUILD.bazel
+load("@ape//ape/toolchain:defs.bzl", "ape_toolchain")
 load("@toolchain_utils//toolchain/test:defs.bzl", "toolchain_test")

 toolchain_type(
@@ -5,9 +6,9 @@ toolchain_type(
    visibility = ["//visibility:public"],
 )

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


--- a/curl/upload/file/rule.bzl
+++ b/curl/upload/file/rule.bzl
@@ -42,7 +42,7 @@ ATTRS = {
 }

 def implementation(ctx):
-    curl = ctx.toolchains["//curl/toolchain/cli:type"]
+    curl = ctx.toolchains["//curl/toolchain/curl:type"]

    executable = ctx.actions.declare_file("{}.sh".format(ctx.label.name))

@@ -74,6 +74,6 @@ file = rule(
    doc = DOC,
    attrs = ATTRS,
    implementation = implementation,
-    toolchains = ["//curl/toolchain/cli:type"],
+    toolchains = ["//curl/toolchain/curl:type"],
    executable = True,
 )
--- a/e2e/.bazelrc
+++ b/e2e/.bazelrc
+# Enable `bzlmod`
+common --enable_bzlmod
+
 # Build cache
 build --experimental_guard_against_concurrent_changes

@@ -10,5 +13,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
--- a/e2e/.bazelrc.ci
+++ b/e2e/.bazelrc.ci
@@ -29,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/BUILD.bazel
+++ b/e2e/BUILD.bazel
@@ -4,7 +4,6 @@ build_test(
    name = "entrypoint",
    targets = [
        "@curl//:entrypoint",
-        "@rules_curl//:cli",
        "@rules_curl//:curl",
    ],
 )
--- a/e2e/MODULE.bazel
+++ b/e2e/MODULE.bazel
@@ -6,7 +6,7 @@ module(
 )

 bazel_dep(name = "bazel_skylib", version = "1.5.0")
-bazel_dep(name = "toolchain_utils", version = "1.0.0-beta.1")
+bazel_dep(name = "toolchain_utils", version = "1.0.0-beta.9")
 bazel_dep(name = "rules_curl")
 local_path_override(
    module_name = "rules_curl",

--- a/e2e/MODULE.bazel.lock
+++ b/e2e/MODULE.bazel.lock
--- a/e2e/mock/BUILD.bazel
+++ b/e2e/mock/BUILD.bazel
-load("@toolchain_utils//toolchain/symlink/target:defs.bzl", "toolchain_symlink_target")
+load("@toolchain_utils//toolchain/info:defs.bzl", "toolchain_info")
 load("@toolchain_utils//toolchain/test:defs.bzl", "toolchain_test")

 package(default_visibility = ["//visibility:public"])

-toolchain_symlink_target(
+toolchain_info(
    name = "shell",
    target = ":curl.sh",
 )
@@ -14,7 +14,7 @@ toolchain(
        "@toolchain_utils//toolchain/constraint/os:linux",
    ],
    toolchain = ":shell",
-    toolchain_type = "@rules_curl//curl/toolchain/cli:type",
+    toolchain_type = "@rules_curl//curl/toolchain/curl:type",
 )

 toolchain(
@@ -23,7 +23,7 @@ toolchain(
        "@toolchain_utils//toolchain/constraint/os:macos",
    ],
    toolchain = ":shell",
-    toolchain_type = "@rules_curl//curl/toolchain/cli:type",
+    toolchain_type = "@rules_curl//curl/toolchain/curl:type",
 )

 # TODO: implement a Windows Batch mocked toolchain
@@ -31,6 +31,6 @@ toolchain(
 toolchain_test(
    name = "test",
    args = ["--version"],
-    toolchains = ["@rules_curl//curl/toolchain/cli:resolved"],
+    toolchains = ["@rules_curl//curl/toolchain/curl:resolved"],
    visibility = ["//visibility:private"],
 )
No results found