From 2ee734e5045027bdc1cfb8873838a492df62c9fa Mon Sep 17 00:00:00 2001
From: Alex Eagle <alex@aspect.dev>
Date: Wed, 11 Dec 2024 10:52:47 -0800
Subject: [PATCH 1/3] chore: upgrade regctl

Also opt-in to Bazel 8 repo naming with plus rather than tilde

Fixes #738
---
 .bazelrc                 | 3 +++
 .bazelversion            | 2 +-
 oci/private/versions.bzl | 9 +++++++++
 oci/repositories.bzl     | 2 +-
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/.bazelrc b/.bazelrc
index 3dd14587..649042a9 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -6,6 +6,9 @@ build --incompatible_strict_action_env
 build --nolegacy_external_runfiles
 common --test_env=DOCKER_HOST --action_env=DOCKER_HOST --repo_env=DOCKER_HOST
 
+# Prepare for Bazel 8
+common --incompatible_use_plus_in_repo_names
+
 # Disable bzlmod lockfile
 common --lockfile_mode=off
 
diff --git a/.bazelversion b/.bazelversion
index d0e2bf01..01f266ec 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1,4 +1,4 @@
-7.1.1
+7.4.1
 
 # The first line of this file is used by Bazelisk and Bazel to be sure
 # the right version of Bazel is used to build and test this repo.
diff --git a/oci/private/versions.bzl b/oci/private/versions.bzl
index 0ba097b8..b263ace8 100644
--- a/oci/private/versions.bzl
+++ b/oci/private/versions.bzl
@@ -18,6 +18,15 @@ CRANE_VERSIONS = {
 }
 
 REGCTL_VERSIONS = {
+    "v0.8.0": {
+        "darwin-amd64": "sha256-RHuyX4G1Sk1plj0spLmK476+Jljk/fqh3oOAvCzCwuw=",
+        "darwin-arm64": "sha256-jUzYxiyhtoeh4clFm8kdLfkzmHkk65+YksB/eBJAqJU=",
+        "linux-amd64": "sha256-Inbt7loeXLibtORI5dAjVkrNbYSlQZzJL/Ji2F37jpo=",
+        "linux-arm64": "sha256-6cXL+dpQUoQgkcNiG0k+piHw/+G3KqdrYLa1/haquN4=",
+        "linux-ppc64le": "sha256-0w0qwWCpx97Ew2quFz9IBuHi4ZwoSj41oFLxco2/v3g=",
+        "linux-s390x": "sha256-mtTFWhB0BcWANbF3RSdk12pVcwtkg7RKkC7mwyHyV5U=",
+        "windows-amd64": "sha256-OaMBqF3M/kedW1bVI4GLuwDW3jzjT8Ujn7CtPkT+inc=",
+    },
     "v0.7.0": {
         "darwin-amd64": "sha256-QH7AeVJi/Ehn09yCVDq1qWvO6VBwquAFV6uPQyX5DDQ=",
         "darwin-arm64": "sha256-QTr9nUPdjknzYTnOgfKG32C2id3aPngG82V7zLOWQL8=",
diff --git a/oci/repositories.bzl b/oci/repositories.bzl
index 58c73fb0..409ae72b 100644
--- a/oci/repositories.bzl
+++ b/oci/repositories.bzl
@@ -60,7 +60,7 @@ regctl_toolchain(
     regctl = "regctl{ext}",
 )
 """
-REGCTL_VERSION = "v0.7.0"
+REGCTL_VERSION = "v0.8.0"
 
 REGCTL_PLATFORMS = {
     name: platform

From 090639b18e01571e724878f0f7d7bfcba9fbe77a Mon Sep 17 00:00:00 2001
From: Alex Eagle <alex@aspect.dev>
Date: Wed, 11 Dec 2024 11:29:47 -0800
Subject: [PATCH 2/3] chore: remove XDG_CACHE_HOME

Due to https://github.com/bazelbuild/bazel/pull/21817
---
 .github/workflows/ci.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index dcc8c806..69842126 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -138,9 +138,6 @@ jobs:
 
       - name: bazel test //...
         working-directory: ${{ matrix.folder }}
-        env:
-          # Bazelisk will download bazel to here, ensure it is cached between runs.
-          XDG_CACHE_HOME: ~/.cache/bazel-repo
         run: |
           bazel \
           --bazelrc=$GITHUB_WORKSPACE/.github/workflows/ci.bazelrc \

From d2af1d761d0a24d754838bd937ecb191dbd25149 Mon Sep 17 00:00:00 2001
From: Alex Eagle <alex@aspect.dev>
Date: Wed, 11 Dec 2024 12:10:03 -0800
Subject: [PATCH 3/3] fixup! chore: upgrade regctl

---
 .bazelrc | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.bazelrc b/.bazelrc
index 649042a9..3dd14587 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -6,9 +6,6 @@ build --incompatible_strict_action_env
 build --nolegacy_external_runfiles
 common --test_env=DOCKER_HOST --action_env=DOCKER_HOST --repo_env=DOCKER_HOST
 
-# Prepare for Bazel 8
-common --incompatible_use_plus_in_repo_names
-
 # Disable bzlmod lockfile
 common --lockfile_mode=off