Compare revisions

Matthew Clarkson · Matthew Clarkson · Matthew Clarkson · Lukasz Okraszewski · Matthew Clarkson · Matthew Clarkson
--- 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,33 @@ 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
--- 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,14 @@ test:
  parallel:
    matrix:
      - ROOT:
-          - .
-          - e2e
+        - .
+        - e2e
+        CONFIG:
+        - local
+        # TODO: fix up remote compilation with `zig`
+        # - 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-alpha.2](https://git.gitlab.arm.com/bazel/rules_squashfs/compare/v1.0.0-alpha.1...v1.0.0-alpha.2) (2024-05-09)
+
+### Bug Fixes
+
+- use `ToolchainInfo#run` from newer `toolchain_utils` ([77149b4](https://git.gitlab.arm.com/bazel/rules_squashfs/commit/77149b4dfa09ab21b115f78bbaa0c99b29fa384f))
+
+### Features
+
+- update toolchain utils ([734a1ff](https://git.gitlab.arm.com/bazel/rules_squashfs/commit/734a1ff3428fd45463b9bf18aa34396aa622aa69))
+
 # 1.0.0-alpha.1 (2024-02-21)

 ### Features

--- a/CODEOWNERS
+++ b/CODEOWNERS
 * @bazel

-# TODO: update sections with relevant people
-
-[Shell] @bazel
+[Shell] @matthew.clarkson @lukasz.okrasewski
 *.sh

-[Batch] @bazel
+[Batch] @matthew.clarkson
 *.bat

-[JavaScript] @bazel
+[JavaScript] @matthew.clarkson
 *.js
 *.mjs

-[C] @bazel
+[C] @matthew.clarkson
 *.c
 *.h

-[C++] @bazel
+[C++] @matthew.clarkson
 *.cpp
 *.hpp
 *.cc
 *.hh

-[Rust] @bazel
+[Rust] @matthew.clarkson
 *.rs

-[Documentation] @bazel
+[Documentation] @matthew.clarkson
 *.md

-[Licensing] @bazel
+[Licensing] @matthew.clarkson
 /.reuse/dep5
 /LICENSES/*

-[Configuration] @bazel
+[Configuration] @matthew.clarkson
 .editorconfig

-[CI] @bazel
+[CI] @matthew.clarkson
 .gitlab-ci.yml

-[Release] @bazel
+[Release] @matthew.clarkson
 /.releaserc.yaml

-[Node] @bazel
+[Node] @matthew.clarkson
 /package.json
 /.npmrc

-[Branding] @bazel
+[Branding] @matthew.clarkson
 /icon.svg

-[Bazel] @bazel
+[Bazel] @matthew.clarkson @lukasz.okraszewski
 /.bazelrc
 /.bazelrc.ci
 /.bazelignore

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

-bazel_dep(name = "rules_coreutils", version = "1.0.0-alpha.7")
-bazel_dep(name = "toolchain_utils", version = "1.0.0-beta.1")
+bazel_dep(name = "rules_coreutils", version = "1.0.0-beta.1")
+bazel_dep(name = "toolchain_utils", version = "1.0.0-beta.9")
 bazel_dep(name = "squashfs-tools", version = "4.6.1")

-bazel_dep(name = "hermetic_cc_toolchain", version = "2.2.3", dev_dependency = True)
+bazel_dep(name = "hermetic_cc_toolchain", version = "3.0.0", dev_dependency = True)

 which = use_repo_rule("@toolchain_utils//toolchain/local/which:defs.bzl", "toolchain_local_which")


--- a/MODULE.bazel.lock
+++ b/MODULE.bazel.lock
--- 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,33 @@ 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
--- a/e2e/MODULE.bazel
+++ b/e2e/MODULE.bazel
@@ -5,7 +5,7 @@ module(
    ],
 )

-bazel_dep(name = "rules_diff", version = "1.0.0-alpha.3")
+bazel_dep(name = "rules_diff", version = "1.0.0-beta.3")
 bazel_dep(name = "rules_squashfs", version = "0.0.0")
 local_path_override(
    module_name = "rules_squashfs",
@@ -13,7 +13,7 @@ local_path_override(
 )

 bazel_dep(name = "bazel_skylib", version = "1.5.0")
-bazel_dep(name = "toolchain_utils", version = "1.0.0-beta.1")
-bazel_dep(name = "rules_coreutils", version = "1.0.0-alpha.7")
+bazel_dep(name = "toolchain_utils", version = "1.0.0-beta.9")
+bazel_dep(name = "rules_coreutils", version = "1.0.0-beta.1")

-bazel_dep(name = "hermetic_cc_toolchain", version = "2.2.3", dev_dependency = True)
+bazel_dep(name = "hermetic_cc_toolchain", version = "3.0.0", dev_dependency = True)
--- a/e2e/MODULE.bazel.lock
+++ b/e2e/MODULE.bazel.lock
--- a/squashfs/tar/rule.bzl
+++ b/squashfs/tar/rule.bzl
@@ -104,7 +104,7 @@ def implementation(ctx):
        outputs = [squashed],
        inputs = inputs,
        executable = rendered,
-        tools = [sqfstar.executable, cat.executable],
+        tools = [sqfstar.run, cat.run],
        arguments = [args],
        mnemonic = "SquashfsTar",
        progress_message = "squashing tars into %{output}",

--- a/squashfs/toolchain/mksquashfs/BUILD.bazel
+++ b/squashfs/toolchain/mksquashfs/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")
+load("@toolchain_utils//toolchain/symlink/target:defs.bzl", "toolchain_symlink_target")

 toolchain_type(
    name = "type",
@@ -12,18 +13,18 @@ toolchain(
    toolchain_type = ":type",
 )

-toolchain_symlink_target(
-    name = "squashfs-tools",
-    basename = "mksquashfs",
-    target = "@squashfs-tools//:mksquashfs",
+toolchain_info(
+    name = "mksquashfs",
+    target = "@squashfs-tools//:mksquashfs"
 )

 toolchain(
    name = "hermetic",
-    toolchain = ":squashfs-tools",
+    toolchain = ":mksquashfs",
    toolchain_type = ":type",
 )

+
 alias(
    name = "resolved",
    actual = "@resolved-mksquashfs",

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

 toolchain_type(
    name = "type",
@@ -12,15 +13,21 @@ toolchain(
    toolchain_type = ":type",
 )

+
 toolchain_symlink_target(
-    name = "squashfs-tools",
-    basename = "sqfstar",
+    name = "symlink",
    target = "@squashfs-tools//:mksquashfs",
+    basename = "sqfstar",
+)
+
+toolchain_info(
+    name = "sqfstar",
+    target = ":symlink",
 )

 toolchain(
    name = "hermetic",
-    toolchain = ":squashfs-tools",
+    toolchain = ":sqfstar",
    toolchain_type = ":type",
 )


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

 toolchain_type(
    name = "type",
@@ -12,15 +12,14 @@ toolchain(
    toolchain_type = ":type",
 )

-toolchain_symlink_target(
-    name = "squashfs-tools",
-    basename = "unsquashfs",
+toolchain_info(
+    name = "unsquashfs",
    target = "@squashfs-tools//:unsquashfs",
 )

 toolchain(
    name = "hermetic",
-    toolchain = ":squashfs-tools",
+    toolchain = ":unsquashfs",
    toolchain_type = ":type",
 )


--- a/squashfs/unpack/rule.bzl
+++ b/squashfs/unpack/rule.bzl
@@ -62,8 +62,7 @@ def implementation(ctx):
    ctx.actions.run(
        outputs = [unpacked],
        inputs = inputs,
-        executable = unsquashfs.executable,
-        tools = [unsquashfs.executable],
+        executable = unsquashfs.run,
        arguments = [args],
        mnemonic = "UnsquashfsDirectory",
        progress_message = "unsquashing %{input} into %{output}",
No results found