From 240f76be6bba59d0204e9abf11527f2a97e3292a Mon Sep 17 00:00:00 2001
From: thespad <spad@linuxserver.io>
Date: Sun, 12 Oct 2025 14:56:02 +0100
Subject: [PATCH] Changes for bake v6 action, bump runner versions back to
 Noble

---
 .github/workflows/build-image.yml            | 6 +++---
 .github/workflows/build-split-image.yml      | 9 +++++----
 .github/workflows/check-and-release.yml      | 4 ++--
 .github/workflows/check-baseimage-update.yml | 4 ++--
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
index 6e9d381..9763841 100644
--- a/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@@ -27,7 +27,7 @@ on:
 
 jobs:
   bake:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     if: ${{ github.actor != 'dependabot[bot]' }}
     steps:
       -
@@ -110,11 +110,11 @@ jobs:
       -
         name: Build and push
         id: build_push
-        uses: docker/bake-action@v5.11.0
+        uses: docker/bake-action@v6.9.0
         with:
           files: |
             ./docker-bake.hcl
-            ${{ steps.docker_meta.outputs.bake-file }}
+            cwd://${{ steps.docker_meta.outputs.bake-file }}
           set: |
             image.args.BUILD_DATE=${{ steps.gen_date.outputs.build_date }}
             image.args.VERSION=${{ steps.gen_release.outputs.tag_name }}
diff --git a/.github/workflows/build-split-image.yml b/.github/workflows/build-split-image.yml
index ceb9e6c..10c6ec5 100644
--- a/.github/workflows/build-split-image.yml
+++ b/.github/workflows/build-split-image.yml
@@ -27,7 +27,7 @@ on:
 
 jobs:
   bake:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     if: ${{ github.actor != 'dependabot[bot]' }}
     strategy:
       matrix:
@@ -114,11 +114,12 @@ jobs:
           echo "app_version=${APP_VERSION}" >> $GITHUB_OUTPUT
       -
         name: Build and push
-        uses: docker/bake-action@v5.11.0
+        id: build_push
+        uses: docker/bake-action@v6.9.0
         with:
           files: |
             ./docker-bake.hcl
-            ${{ steps.docker_meta.outputs.bake-file }}
+            cwd://${{ steps.docker_meta.outputs.bake-file }}
           set: |
             image.args.BUILD_DATE=${{ steps.gen_date.outputs.build_date }}
             image.args.VERSION=${{ steps.gen_release.outputs.tag_name }}
@@ -134,7 +135,7 @@ jobs:
           echo "meta-${{ matrix.arch }}=${{ fromJSON(steps.docker_meta.outputs.json).tags[0] }}" >> $GITHUB_OUTPUT
 
   manifest:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     if: ${{ github.actor != 'dependabot[bot]' }}
     needs: bake
     strategy:
diff --git a/.github/workflows/check-and-release.yml b/.github/workflows/check-and-release.yml
index a583dd3..a53201c 100644
--- a/.github/workflows/check-and-release.yml
+++ b/.github/workflows/check-and-release.yml
@@ -31,7 +31,7 @@ on:
 
 jobs:
   check:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     outputs:
       image_release: ${{ steps.build_check.outputs.image_release }}
       ls_version: ${{ steps.build_check.outputs.ls_version }}
@@ -172,7 +172,7 @@ jobs:
           fi
 
   release:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     needs: check
     if:  ${{ needs.check.outputs.update_available == 'true' }}
     steps:
diff --git a/.github/workflows/check-baseimage-update.yml b/.github/workflows/check-baseimage-update.yml
index d140365..9e28956 100644
--- a/.github/workflows/check-baseimage-update.yml
+++ b/.github/workflows/check-baseimage-update.yml
@@ -28,7 +28,7 @@ on:
 
 jobs:
   get-baseimage-version:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     outputs:
       modified: ${{ steps.git-check.outputs.modified }}
     steps:
@@ -53,7 +53,7 @@ jobs:
           fi
 
   release:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     needs: get-baseimage-version
     if:  ${{ needs.get-baseimage-version.outputs.modified == 'true' }}
     steps: