Compare revisions

Matthew Clarkson · Matthew Clarkson · Matthew Clarkson · Matthew Clarkson · Matthew Clarkson · Matthew Clarkson
--- a/.bazelrc
+++ b/.bazelrc
-# `bzlmod` pre-release registries
-common --registry https://bcr.bazel.build
-common --registry=https://gitlab.arm.com/bazel/rules_gzip/-/releases/v1.0.0-beta.6/downloads
-common --registry=https://gitlab.arm.com/bazel/rules_bzip2/-/releases/v1.0.0-beta.6/downloads
-common --registry=https://gitlab.arm.com/bazel/rules_xz/-/releases/v1.0.0-beta.6/downloads
-common --registry=https://gitlab.arm.com/bazel/rules_zstd/-/releases/v1.0.0-beta.7/downloads
-
 # Build cache
 build --experimental_guard_against_concurrent_changes

+# Disable `WORKSPACE`
+build --noenable_workspace
+
 # Prevent `PATH` and `LD_LIBRARY_PATH` leaking into action enviroment
 build --incompatible_strict_action_env


--- a/.bazelversion
+++ b/.bazelversion
-7.3.1
+8.0.0
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
 include:
-  - component: "${CI_SERVER_HOST}/ci/component/bazelisk/bazelisk@v1.0.0-beta.5"
+  - component: "${CI_SERVER_HOST}/ci/component/bazelisk/ruleset@v1.0.0"
    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
-        CI_LOCKFILE_MODE
+      versions:
+        - 7.1.0
+        - 7.x
+        - 8.x
+        - last_rc
+      configs:
+        - local

 default:
  tags:
    - arm64
-
-.test:
-  extends: .bazelisk
-  cache:
-    - !reference [.bazelisk, cache]
-    - key: "bazel-cache-${CI_PROJECT_ID}"
-      paths:
-        - ".cache/bazel/disk"
-        - ".cache/bazel/repo"
-  variables:
-    CI_LOCKFILE_MODE: error
-    CONFIG: local
-  script:
-    - (cd "${ROOT}"; bazelisk test --config="${CONFIG}" //...)
-
-config:
-  extends: .test
-  parallel:
-    matrix:
-      - ROOT:
-          - .
-          - e2e
-        CONFIG:
-          - local
-          - remote
-
-version:
-  extends: .test
-  variables:
-    CI_LOCKFILE_MODE: "off"
-  parallel:
-    matrix:
-      - ROOT:
-          - .
-          - e2e
-        USE_BAZEL_VERSION:
-          - 7.1.0
-          - 7.x
-          - last_rc
-
-# TODO: switch this out for `rules_semantic_release`
-semantic-release:
-  extends: .test
-  stage: .post
-  needs:
-    - config
-    - version
-  image: node:lts
-  cache:
-    key:
-      prefix: "node"
-      files:
-        - package-lock.json
-    paths:
-      - node_modules
-      - .cache/npm
-  before_script:
-    - npm config --location project set cache "${CI_PROJECT_DIR}/.cache/npm"
-    - npm ci --prefer-offline
-    - !reference [.bazelisk, before_script]
-  script:
-    - npx semantic-release
-  rules:
-    - if: $CI_COMMIT_TAG
-      when: never
-    - if: $CI_COMMIT_REF_PROTECTED == "true"
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
+# [1.0.0-beta.6](https://git.gitlab.arm.com/bazel/rules_tar/compare/v1.0.0-beta.5...v1.0.0-beta.6) (2025-01-09)
+
+### Bug Fixes
+
+- switch to `//tar/tool` ([398aba3](https://git.gitlab.arm.com/bazel/rules_tar/commit/398aba37d3957f6d7cf84bc8fb2aa72ce603c6da))
+
+### Features
+
+- add `//tar/tool` ([dd68a65](https://git.gitlab.arm.com/bazel/rules_tar/commit/dd68a659de2ca27a26ecb6c685a437e7d9c9357c))
+
+### BREAKING CHANGES
+
+- `tar_filter#patterns` is now a list of globs to remove
+  from the tape archive. The filters can still be negated:
+
+```py
+tar_filter(
+    name = "filter.tar.xz",
+    src = "archive.tar.zst",
+    patterns = [
+        "!**/*.md",  # Keep Markdown files
+        "**/*",      # Remove all other members
+    ],
+)
+```
+
 # [1.0.0-beta.5](https://git.gitlab.arm.com/bazel/rules_tar/compare/v1.0.0-beta.4...v1.0.0-beta.5) (2024-11-27)

 ### Bug Fixes

--- a/MODULE.bazel
+++ b/MODULE.bazel
 module(
    name = "rules_tar",
-    version = "1.0.0-beta.5",
+    version = "1.0.0-beta.6",
    bazel_compatibility = [
        ">=7.0.0",
    ],
@@ -45,4 +45,8 @@ go_deps.from_file(go_mod = "//:go.mod")
 use_repo(
    go_deps,
    "com_github_bmatcuk_doublestar_v4",
+    "com_github_dsnet_compress",
+    "com_github_h2non_filetype",
+    "com_github_klauspost_compress",
+    "com_github_ulikunitz_xz",
 )
--- a/MODULE.bazel.lock
+++ b/MODULE.bazel.lock
--- a/README.md
+++ b/README.md
@@ -13,8 +13,10 @@ bazel_dep(name="rules_tar", version="0.0.0")
 Use the unpacking and extraction rules:

 ```py
-load("@rules_tar//tar/unpack:defs.bzl", "tar_unpack")
+load("@rules_tar//tar/concatenate:defs.bzl", "tar_concatenate")
+load("@rules_tar//tar/filter:defs.bzl", "tar_filter")
 load("@rules_tar//tar/extract:defs.bzl", "tar_extract")
+load("@rules_tar//tar/unpack:defs.bzl", "tar_unpack")

 tar_unpack(
    name = "unpack",
@@ -29,6 +31,23 @@ tar_extract(
        "another/member.txt",
    ]
 )
+
+tar_concatenate(
+    name = "concatenate.tar.zst",
+    srcs = [
+        "some.tar.gz",
+        "someother.tar.bzip2",
+        "something.tar.zst",
+    ],
+)
+
+tar_filter(
+    name = "filtered.tar.zst",
+    srcs = "some.tar.xz",
+    patterns = [
+        "**/*.txt",  # Remove all `.txt` members
+    ],
+)
 ```

 > Note: use [rules_pkg] to pack archives.

--- a/WORKSPACE
+++ b/WORKSPACE
--- a/e2e/.bazelrc
+++ b/e2e/.bazelrc
-# `bzlmod` pre-release registries
-common --registry https://bcr.bazel.build
-common --registry=https://gitlab.arm.com/bazel/rules_gzip/-/releases/v1.0.0-beta.6/downloads
-common --registry=https://gitlab.arm.com/bazel/rules_bzip2/-/releases/v1.0.0-beta.6/downloads
-common --registry=https://gitlab.arm.com/bazel/rules_xz/-/releases/v1.0.0-beta.6/downloads
-common --registry=https://gitlab.arm.com/bazel/rules_zstd/-/releases/v1.0.0-beta.7/downloads
-common --registry=https://gitlab.arm.com/bazel/rules_diff/-/releases/v1.0.0-beta.6/downloads
-
 # Build cache
 build --experimental_guard_against_concurrent_changes

+# Disable `WORKSPACE`
+build --noenable_workspace
+
 # Prevent `PATH` and `LD_LIBRARY_PATH` leaking into action enviroment
 build --incompatible_strict_action_env


--- a/e2e/.bazelversion
+++ b/e2e/.bazelversion
-7.3.1
+8.0.0
--- a/e2e/MODULE.bazel.lock
+++ b/e2e/MODULE.bazel.lock
--- a/e2e/concatenate/bzip2/BUILD.bazel
+++ b/e2e/concatenate/bzip2/BUILD.bazel
@@ -8,7 +8,6 @@ tar_concatenate(
        "//fixture:txt.tar.bz2",
        "//fixture/nested:txt.tar.bz2",
    ],
-    compress = "@rules_tar//tar/compress:bzip2",
 )

 tar_unpack(

--- a/e2e/concatenate/compress/bzip2/BUILD.bazel
+++ b/e2e/concatenate/compress/bzip2/BUILD.bazel
+load("@rules_diff//diff/directory/test:defs.bzl", "diff_directory_test")
+load("@rules_tar//tar/unpack:defs.bzl", "tar_unpack")
+load("@rules_tar//tar/concatenate:defs.bzl", "tar_concatenate")
+
+tar_concatenate(
+    name = "concatenated.tar.bz2",
+    srcs = [
+        "//fixture:txt.tar.bz2",
+        "//fixture/nested:txt.tar.bz2",
+    ],
+    compress = "@rules_tar//tar/compress:bzip2",
+)
+
+tar_unpack(
+    name = "unpack",
+    src = ":concatenated.tar.bz2",
+)
+
+diff_directory_test(
+    name = "diff",
+    size = "small",
+    a = "//fixture/directory:all",
+    b = ":unpack",
+)
--- a/e2e/concatenate/compress/gzip/BUILD.bazel
+++ b/e2e/concatenate/compress/gzip/BUILD.bazel
+load("@rules_diff//diff/directory/test:defs.bzl", "diff_directory_test")
+load("@rules_tar//tar/unpack:defs.bzl", "tar_unpack")
+load("@rules_tar//tar/concatenate:defs.bzl", "tar_concatenate")
+
+tar_concatenate(
+    name = "concatenated.tar.gz",
+    srcs = [
+        "//fixture:txt.tar.gz",
+        "//fixture/nested:txt.tar.gz",
+    ],
+    compress = "@rules_tar//tar/compress:gzip",
+)
+
+tar_unpack(
+    name = "unpack",
+    src = ":concatenated.tar.gz",
+)
+
+diff_directory_test(
+    name = "diff",
+    size = "small",
+    a = "//fixture/directory:all",
+    b = ":unpack",
+)
--- a/e2e/concatenate/compress/xz/BUILD.bazel
+++ b/e2e/concatenate/compress/xz/BUILD.bazel
+load("@rules_diff//diff/directory/test:defs.bzl", "diff_directory_test")
+load("@rules_tar//tar/unpack:defs.bzl", "tar_unpack")
+load("@rules_tar//tar/concatenate:defs.bzl", "tar_concatenate")
+
+tar_concatenate(
+    name = "concatenated.tar.xz",
+    srcs = [
+        "//fixture:txt.tar.xz",
+        "//fixture/nested:txt.tar.xz",
+    ],
+    compress = "@rules_tar//tar/compress:xz",
+)
+
+tar_unpack(
+    name = "unpack",
+    src = ":concatenated.tar.xz",
+)
+
+diff_directory_test(
+    name = "diff",
+    size = "small",
+    a = "//fixture/directory:all",
+    b = ":unpack",
+)
--- a/e2e/concatenate/compress/zstd/BUILD.bazel
+++ b/e2e/concatenate/compress/zstd/BUILD.bazel
+load("@rules_diff//diff/directory/test:defs.bzl", "diff_directory_test")
+load("@rules_tar//tar/unpack:defs.bzl", "tar_unpack")
+load("@rules_tar//tar/concatenate:defs.bzl", "tar_concatenate")
+
+tar_concatenate(
+    name = "concatenated.tar.zst",
+    srcs = [
+        "//fixture:txt.tar.zst",
+        "//fixture/nested:txt.tar.zst",
+    ],
+    compress = "@rules_tar//tar/compress:zstd",
+)
+
+tar_unpack(
+    name = "unpack",
+    src = ":concatenated.tar.zst",
+)
+
+diff_directory_test(
+    name = "diff",
+    size = "small",
+    a = "//fixture/directory:all",
+    b = ":unpack",
+)
--- a/e2e/concatenate/gzip/BUILD.bazel
+++ b/e2e/concatenate/gzip/BUILD.bazel
@@ -8,7 +8,6 @@ tar_concatenate(
        "//fixture:txt.tar.gz",
        "//fixture/nested:txt.tar.gz",
    ],
-    compress = "@rules_tar//tar/compress:gzip",
 )

 tar_unpack(

--- a/e2e/concatenate/xz/BUILD.bazel
+++ b/e2e/concatenate/xz/BUILD.bazel
@@ -8,7 +8,6 @@ tar_concatenate(
        "//fixture:txt.tar.xz",
        "//fixture/nested:txt.tar.xz",
    ],
-    compress = "@rules_tar//tar/compress:xz",
 )

 tar_unpack(

--- a/e2e/concatenate/zstd/BUILD.bazel
+++ b/e2e/concatenate/zstd/BUILD.bazel
@@ -8,7 +8,6 @@ tar_concatenate(
        "//fixture:txt.tar.zst",
        "//fixture/nested:txt.tar.zst",
    ],
-    compress = "@rules_tar//tar/compress:zstd",
 )

 tar_unpack(
@@ -21,6 +20,4 @@ diff_directory_test(
    size = "small",
    a = "//fixture/directory:all",
    b = ":unpack",
-    # FIXME: not sure why `zstd` decompression is failing
-    tags = ["manual"],
 )
--- a/e2e/filter/BUILD.bazel
+++ b/e2e/filter/BUILD.bazel
@@ -5,7 +5,7 @@ load("@rules_tar//tar/filter:defs.bzl", "tar_filter")
 tar_filter(
    name = "filtered.tar",
    src = "//fixture:fixture.tar",
-    patterns = ["fixture/*.txt"],
+    patterns = ["fixture/nested/*.txt"],
 )

 tar_unpack(
No results found