From 081b259a1f456b2e9f60531c1f0474fadb80f23b Mon Sep 17 00:00:00 2001
From: UebelAndre <github@uebelandre.com>
Date: Fri, 20 Feb 2026 15:46:52 -0800
Subject: [PATCH 1/2] Fix pkg workflow

---
 .DS_Store                          | Bin 6148 -> 0 bytes
 .github/workflows/bcr-publish.yaml |  44 +++++++++++++++++++++++++++++
 .github/workflows/workflow.yml     |  10 ++++++-
 BUILD.bazel                        |   2 ++
 tests/BUILD.bazel                  |   2 +-
 5 files changed, 56 insertions(+), 2 deletions(-)
 delete mode 100644 .DS_Store
 create mode 100644 .github/workflows/bcr-publish.yaml

diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index 1f68f902000fec95efe0cc0a9be16bd10c71e2c2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKJ8Hu~5S>X}n7C2ta<7mZEJ8kkE?|g_0}&1+B(*A^%SZE@55_`Hks?ia12b=T
zcHRoTLZcB8ZNGNUB8`YF;f8XuFgH6lpV>oZ6bQ#1gS^PA>=EB))%O#|eUeXS4Y&O7
z{^K~j9}jW&eKNCDfC^9nDnJFOz^@gs-V0l<0vV|Q6`%rF1?>A!;D$AE4D?S2f{y^e
z1=4O<`z!%0mH^hoF%TJ;1{D}o%@IR`j(o|wnm7gqT{MRe%_nP4DC$qg{l&{gYak;P
zpaN3`9%I{B|KGrWnE$6F?x+A2_*V+(qU*aBuav!Y_Hx#13w#T=nls!CYo{Q1I|h0?
h#>U$5+KZyD*c#_GaSU`i@=gcxXTWr!QGvf!-~#iQ6><Oo

diff --git a/.github/workflows/bcr-publish.yaml b/.github/workflows/bcr-publish.yaml
new file mode 100644
index 0000000..1586427
--- /dev/null
+++ b/.github/workflows/bcr-publish.yaml
@@ -0,0 +1,44 @@
+# See https://github.com/bazel-contrib/publish-to-bcr
+name: Publish to BCR
+
+on:
+  # Allow the publish workflow to be called from another workflow.
+  # In this case, we trigger it from the release.yaml workflow.
+  workflow_call:
+    inputs:
+      release_version:
+        required: true
+        type: string
+    secrets:
+      BCR_PUBLISH_TOKEN:
+        required: true
+  # In case of problems, let release engineers retry by manually dispatching
+  # the workflow from the GitHub UI.
+  workflow_dispatch:
+    inputs:
+      release_version:
+        required: true
+        type: string
+        description: Release version to publish to the Bazel Central Registry
+      templates_ref:
+        default: ''
+        type: string
+        description: Override the ref to read .bcr templates from
+jobs:
+  publish:
+    uses: bazel-contrib/publish-to-bcr/.github/workflows/publish.yaml@v1.1.0
+    with:
+      attest: false
+      tag_name: ${{ inputs.release_version }}
+      author_name: aignas
+      author_email: 240938+aignas@users.noreply.github.com
+      # Tags don't include a "v" prefix
+      tag_prefix: ""
+      # GitHub repository which is a fork of the upstream where the Pull Request will be opened.
+      registry_fork: aignas/bazel-central-registry
+      templates_ref: ${{ inputs.templates_ref || inputs.release_version }}
+      draft: false
+    permissions:
+      contents: write
+    secrets:
+      publish_token: ${{ secrets.BCR_PUBLISH_TOKEN }}
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 7eabe24..c4edf8a 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -58,6 +58,8 @@ jobs:
   release:
     if: startsWith(github.ref, 'refs/tags/')
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
     needs: pkg
     steps:
       - name: Download release artifacts
@@ -68,8 +70,14 @@ jobs:
       - name: Release
         uses: softprops/action-gh-release@v2
         with:
-          # Use GH feature to populate the changelog automatically
           generate_release_notes: true
           body_path: release_notes.md
           fail_on_unmatched_files: true
           files: rules_shellcheck-*.tar.gz
+
+      - name: BCR Publish
+        uses: ./.github/workflows/bcr-publish.yaml
+        with:
+          release_version: ${{ github.ref_name }}
+        secrets:
+          BCR_PUBLISH_TOKEN: ${{ secrets.BCR_PUBLISH_TOKEN }}
diff --git a/BUILD.bazel b/BUILD.bazel
index afe829e..44e400d 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -2,6 +2,8 @@ filegroup(
     name = "distribution",
     srcs = [
         "BUILD.bazel",
+        "def.bzl",
+        "deps.bzl",
         "CHANGELOG.md",
         "LICENSE",
         "MODULE.bazel",
diff --git a/tests/BUILD.bazel b/tests/BUILD.bazel
index 8ff45f3..743ab2b 100644
--- a/tests/BUILD.bazel
+++ b/tests/BUILD.bazel
@@ -1,5 +1,5 @@
-load(":test.bzl", shellcheck_test = "shellcheck_internal_test")
 load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
+load(":test.bzl", shellcheck_test = "shellcheck_internal_test")
 
 shellcheck_test(
     name = "fail_test",

From 35de02858007aceea60f7b85c32f2b2c3dfe12a1 Mon Sep 17 00:00:00 2001
From: UebelAndre <github@uebelandre.com>
Date: Sat, 21 Feb 2026 07:32:15 -0800
Subject: [PATCH 2/2] Fix schema error in workflow

---
 .../{bcr-publish.yaml => bcr-publish.yml}     |  0
 .github/workflows/release.yml                 | 58 +++++++++++++++++++
 .github/workflows/workflow.yml                | 47 ++++-----------
 3 files changed, 68 insertions(+), 37 deletions(-)
 rename .github/workflows/{bcr-publish.yaml => bcr-publish.yml} (100%)
 create mode 100644 .github/workflows/release.yml

diff --git a/.github/workflows/bcr-publish.yaml b/.github/workflows/bcr-publish.yml
similarity index 100%
rename from .github/workflows/bcr-publish.yaml
rename to .github/workflows/bcr-publish.yml
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 0000000..79885c1
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,58 @@
+---
+name: Release
+
+on: # yamllint disable rule:truthy
+  push:
+    branches:
+      - main
+    tags:
+      - "*.*.*"
+
+jobs:
+  pkg:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v5
+
+      - name: Create release archive and notes
+        # Set by GH actions, see
+        # https://docs.github.com/en/actions/learn-github-actions/environment-variables#default-environment-variables
+        run: ./ci/package.sh "${{ github.ref_name }}"
+
+      - name: Archive release artifacts
+        uses: actions/upload-artifact@v5
+        with:
+          name: release
+          path: release/*
+          retention-days: 5
+
+  release:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    needs: pkg
+    steps:
+      - name: Download release artifacts
+        uses: actions/download-artifact@v6
+        with:
+          name: release
+
+      - name: Release
+        uses: softprops/action-gh-release@v2
+        with:
+          generate_release_notes: true
+          body_path: release_notes.md
+          fail_on_unmatched_files: true
+          files: rules_shellcheck-*.tar.gz
+
+  bcr-publish:
+    needs: [release]
+    permissions:
+      contents: write
+    uses: ./.github/workflows/bcr-publish.yml
+    with:
+      release_version: ${{ needs.release.outputs.release_version }}
+    secrets:
+      BCR_PUBLISH_TOKEN: ${{ secrets.BCR_PUBLISH_TOKEN }}
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index c4edf8a..0fb5618 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -13,7 +13,12 @@ on:  # yamllint disable rule:truthy
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        include:
+          - os: macos-latest
+          - os: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v5
@@ -24,20 +29,15 @@ jobs:
       - name: Test
         run: bazel test //...
 
-  test-mac:
-    runs-on: macos-latest
-
-    steps:
-      - uses: actions/checkout@v5
-
-      - name: Test
-        run: bazel test //...
+      - name: Create release archive and notes
+        # Set by GH actions, see
+        # https://docs.github.com/en/actions/learn-github-actions/environment-variables#default-environment-variables
+        run: ./ci/package.sh "${{ github.ref_name }}"
 
   pkg:
     runs-on: ubuntu-latest
     needs:
       - build
-      - test-mac
 
     steps:
       - name: Checkout
@@ -54,30 +54,3 @@ jobs:
           name: release
           path: release/*
           retention-days: 5
-
-  release:
-    if: startsWith(github.ref, 'refs/tags/')
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    needs: pkg
-    steps:
-      - name: Download release artifacts
-        uses: actions/download-artifact@v6
-        with:
-          name: release
-
-      - name: Release
-        uses: softprops/action-gh-release@v2
-        with:
-          generate_release_notes: true
-          body_path: release_notes.md
-          fail_on_unmatched_files: true
-          files: rules_shellcheck-*.tar.gz
-
-      - name: BCR Publish
-        uses: ./.github/workflows/bcr-publish.yaml
-        with:
-          release_version: ${{ github.ref_name }}
-        secrets:
-          BCR_PUBLISH_TOKEN: ${{ secrets.BCR_PUBLISH_TOKEN }}