Compare revisions

Matthew Clarkson · Matthew Clarkson · Matthew Clarkson · Matthew Clarkson · Matthew Clarkson · Matthew Clarkson
--- a/.bazelrc.ci
+++ b/.bazelrc.ci
@@ -25,6 +25,40 @@ 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 --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
+
+# Describe remote executors
+build:remote --extra_execution_platforms=@toolchain_utils//toolchain/platform:amd64-linux-gnu
--- a/.bazelversion
+++ b/.bazelversion
-7.x
+7.3.1
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
 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.5"
+    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:
@@ -7,15 +21,27 @@ default:

 test:
  extends: .bazelisk
+  cache:
+    - !reference [.bazelisk, cache]
+    - key: "bazel-cache-${CI_PROJECT_ID}"
+      paths:
+      - ".cache/bazel/disk"
+      - ".cache/bazel/repo"
  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:
  stage: .post
+  extends: .bazelisk
  needs:
    - test
  image: node:lts
@@ -30,8 +56,8 @@ semantic-release:
  before_script:
    - npm config --location project set cache "${CI_PROJECT_DIR}/.cache/npm"
    - npm ci --prefer-offline
+    - !reference [.bazelisk, before_script]
  script:
-    - !reference [.bazelisk-fragment, rc]
    - npx semantic-release
  rules:
    - if: $CI_COMMIT_TAG

--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -2,7 +2,7 @@ load("@rules_diff//diff/file/test:defs.bzl", "diff_file_test")

 diff_file_test(
    name = "placeholder",
+    size = "small",
    a = "WORKSPACE",
    b = "WORKSPACE",
-    size = "small",
 )
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
+# [1.0.0-beta.3](https://git.gitlab.arm.com/bazel/download_utils/compare/v1.0.0-beta.2...v1.0.0-beta.3) (2024-11-04)
+
+### Bug Fixes
+
+- update dependencies for Bazel 8 support ([39f3718](https://git.gitlab.arm.com/bazel/download_utils/commit/39f37182454a4d1137d1554f205ad45aa0f616a5))
+
 # [1.0.0-beta.2](https://git.gitlab.arm.com/bazel/download_utils/compare/v1.0.0-beta.1...v1.0.0-beta.2) (2024-03-12)

 ### Bug Fixes

--- a/MODULE.bazel
+++ b/MODULE.bazel
 module(
    name = "download_utils",
-    version = "1.0.0-beta.2",
+    version = "1.0.0-beta.3",
    bazel_compatibility = [
-        ">=7.0.0",
+        ">=7.1.0",
    ],
    compatibility_level = 1,
 )

-bazel_dep(name = "rules_diff", version = "1.0.0-alpha.3", dev_dependency = True)
+bazel_dep(name = "rules_diff", version = "1.0.0-beta.5", dev_dependency = True)
+bazel_dep(name = "toolchain_utils", version = "1.0.0-beta.17", dev_dependency = True)
--- a/MODULE.bazel.lock
+++ b/MODULE.bazel.lock
--- a/README.md
+++ b/README.md
@@ -101,7 +101,7 @@ Add the following to `.bazelrc`:
 ```
 # `bzlmod` pre-release registries
 common --registry https://bcr.bazel.build
-common --registry=https://gitlab.arm.com/bazel/rules_placeholder/-/releases/v1.0.0-alpha.1/downloads
+common --registry=https://gitlab.arm.com/bazel/download_utils/-/releases/v1.0.0-alpha.1/downloads
 ```

 Then a GitLab release version can be used in `bazel_dep`.

--- a/e2e/.bazelrc.ci
+++ b/e2e/.bazelrc.ci
@@ -25,6 +25,40 @@ 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 --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
+
+# Describe remote executors
+build:remote --extra_execution_platforms=@toolchain_utils//toolchain/platform:amd64-linux-gnu
--- a/e2e/.bazelversion
+++ b/e2e/.bazelversion
-7.x
+7.3.1
--- a/e2e/MODULE.bazel
+++ b/e2e/MODULE.bazel
@@ -11,8 +11,8 @@ local_path_override(
    path = "..",
 )

-bazel_dep(name = "rules_diff", version = "1.0.0-alpha.3")
-bazel_dep(name = "toolchain_utils", version = "1.0.0-beta.3")
+bazel_dep(name = "rules_diff", version = "1.0.0-beta.5")
+bazel_dep(name = "toolchain_utils", version = "1.0.0-beta.17")

 archive = use_repo_rule("@download_utils//download/archive:defs.bzl", "download_archive")

@@ -63,57 +63,33 @@ deb(
    urls = ["file://%workspace%/test_1.0-1_all.deb"],
 )

-archive(
-    name = "coreutils-arm64-linux-gnu",
-    build = "//coreutils:BUILD.tmpl.bazel",
-    integrity = "sha256-mlmkbeabyu4+5+cFiUSL6Ki4KFNqWu48gTjFc3NS43g=",
-    strip_prefix = "coreutils-0.0.21-aarch64-unknown-linux-gnu",
-    urls = ["https://github.com/uutils/coreutils/releases/download/0.0.21/coreutils-0.0.21-aarch64-unknown-linux-gnu.tar.gz"],
-)
-
-archive(
-    name = "coreutils-amd64-linux-gnu",
-    build = "//coreutils:BUILD.tmpl.bazel",
-    integrity = "sha256-8zd3E3oh4kLUVnIl2grQyY+RekwvlQVlmZP5ftclnkg=",
-    strip_prefix = "coreutils-0.0.21-x86_64-unknown-linux-gnu",
-    urls = ["https://github.com/uutils/coreutils/releases/download/0.0.21/coreutils-0.0.21-x86_64-unknown-linux-gnu.tar.gz"],
-)
-
-archive(
-    name = "coreutils-amd64-windows-msvc",
-    build = "//coreutils:BUILD.tmpl.bazel",
-    integrity = "sha256-MnwdLPwZ+S5/cYPRym8lhcyvazAuhzJaZCmBLAW5+80=",
-    links = {
-        "coreutils.exe": "coreutils",
-    },
-    strip_prefix = "coreutils-0.0.21-x86_64-pc-windows-msvc",
-    tools = ["//coreutils:mklink.bat"],
-    urls = ["https://github.com/uutils/coreutils/releases/download/0.0.21/coreutils-0.0.21-x86_64-pc-windows-msvc.zip"],
-)
-
-archive(
-    name = "coreutils-arm64-macos-darwin",
-    build = "//coreutils:BUILD.tmpl.bazel",
-    integrity = "sha256-KP90sjKxtXDbLC+o5f4+gQnvP3Tr7O0RopME4g9QF5E=",
-    strip_prefix = "coreutils-0.0.23-aarch64-apple-darwin",
-    urls = ["https://github.com/uutils/coreutils/releases/download/0.0.23/coreutils-0.0.23-aarch64-apple-darwin.tar.gz"],
-)
-
-archive(
-    name = "coreutils-amd64-macos-darwin",
-    build = "//coreutils:BUILD.tmpl.bazel",
-    integrity = "sha256-SswetVAuK/hMK1r9uBvNnKj5JpSgD0bzkbsHTxOabCo=",
-    strip_prefix = "coreutils-0.0.23-x86_64-apple-darwin",
-    urls = ["https://github.com/uutils/coreutils/releases/download/0.0.23/coreutils-0.0.23-x86_64-apple-darwin.tar.gz"],
-)
+[
+    archive(
+        name = "coreutils-{}".format(triplet),
+        srcs = ["entrypoint"],
+        integrity = integrity,
+        links = {
+            "coreutils.exe" if "windows" in basename else "coreutils": "entrypoint",
+        },
+        strip_prefix = "coreutils-0.0.27-{}".format(basename.partition(".")[0]),
+        urls = ["https://github.com/uutils/coreutils/releases/download/0.0.27/coreutils-0.0.27-{}".format(basename)],
+    )
+    for triplet, basename, integrity in (
+        ("arm64-linux-musl", "aarch64-unknown-linux-musl.tar.gz", "sha256-doU+ZfTyA5I8RSwDAcsOkEI3BZXFuFwBfEbg+diS06g="),
+        ("amd64-linux-musl", "x86_64-unknown-linux-musl.tar.gz", "sha256-tM+hJd16cCjflJyMwsCaevPYZMiBkIKZJm7/XC+760w="),
+        ("amd64-windows-msvc", "x86_64-pc-windows-msvc.zip", "sha256-DC4H+hQX51aHoFudV39n7u217NDcNL9AiG4o4edboV0="),
+        ("arm64-macos-darwin", "aarch64-apple-darwin.tar.gz", "sha256-BjAeGgJ8+sLCIwmokCOkfelCCLtnNRH49QcFnrDq8a4="),
+        ("amd64-macos-darwin", "x86_64-apple-darwin.tar.gz", "sha256-1ivz4ue8/ROUYhPh22Bg2ASPgC6MKMulR52nLgZvTBo="),
+    )
+]

 select = use_repo_rule("@toolchain_utils//toolchain/local/select:defs.bzl", "toolchain_local_select")

 select(
    name = "coreutils",
    map = {
-        "arm64-linux-gnu": "@coreutils-arm64-linux-gnu",
-        "amd64-linux-gnu": "@coreutils-amd64-linux-gnu",
+        "arm64-linux": "@coreutils-arm64-linux-musl",
+        "amd64-linux": "@coreutils-amd64-linux-musl",
        "amd64-windows": "@coreutils-amd64-windows-msvc",
        "arm64-macos-darwin": "@coreutils-arm64-macos-darwin",
        "amd64-macos-darwin": "@coreutils-amd64-macos-darwin",

--- a/e2e/MODULE.bazel.lock
+++ b/e2e/MODULE.bazel.lock
--- a/lib/workspace.bzl
+++ b/lib/workspace.bzl
@@ -17,7 +17,6 @@ def workspace(rctx):
        root = root.dirname
    return str(rctx.workspace_root).replace(str(root), "/")

-
 def write(rctx, canonical):
    """
    Generate a `WORKSPACE` file that is stamped with the canonical arguments.
@@ -26,5 +25,5 @@ def write(rctx, canonical):
        rctx: The download repository context.
        canonical: The final canonical arguments
    """
-    rctx.file("WORKSPACE", "# {}".format(canonical), executable=False)
+    rctx.file("WORKSPACE", "# {}".format(canonical), executable = False)
    return canonical
No results found