Skip to content

Commit 7b14762

Browse files
authored
Merge pull request #173 from linuxserver-labs/release/v7.2.0
2 parents 1693ec3 + 240f76b commit 7b14762

File tree

4 files changed

+12
-11
lines changed

4 files changed

+12
-11
lines changed

.github/workflows/build-image.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ on:
2727

2828
jobs:
2929
bake:
30-
runs-on: ubuntu-22.04
30+
runs-on: ubuntu-latest
3131
if: ${{ github.actor != 'dependabot[bot]' }}
3232
steps:
3333
-
@@ -110,11 +110,11 @@ jobs:
110110
-
111111
name: Build and push
112112
id: build_push
113-
uses: docker/bake-action@v5.11.0
113+
uses: docker/bake-action@v6.9.0
114114
with:
115115
files: |
116116
./docker-bake.hcl
117-
${{ steps.docker_meta.outputs.bake-file }}
117+
cwd://${{ steps.docker_meta.outputs.bake-file }}
118118
set: |
119119
image.args.BUILD_DATE=${{ steps.gen_date.outputs.build_date }}
120120
image.args.VERSION=${{ steps.gen_release.outputs.tag_name }}

.github/workflows/build-split-image.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ on:
2727

2828
jobs:
2929
bake:
30-
runs-on: ubuntu-22.04
30+
runs-on: ubuntu-latest
3131
if: ${{ github.actor != 'dependabot[bot]' }}
3232
strategy:
3333
matrix:
@@ -114,11 +114,12 @@ jobs:
114114
echo "app_version=${APP_VERSION}" >> $GITHUB_OUTPUT
115115
-
116116
name: Build and push
117-
uses: docker/bake-action@v5.11.0
117+
id: build_push
118+
uses: docker/bake-action@v6.9.0
118119
with:
119120
files: |
120121
./docker-bake.hcl
121-
${{ steps.docker_meta.outputs.bake-file }}
122+
cwd://${{ steps.docker_meta.outputs.bake-file }}
122123
set: |
123124
image.args.BUILD_DATE=${{ steps.gen_date.outputs.build_date }}
124125
image.args.VERSION=${{ steps.gen_release.outputs.tag_name }}
@@ -134,7 +135,7 @@ jobs:
134135
echo "meta-${{ matrix.arch }}=${{ fromJSON(steps.docker_meta.outputs.json).tags[0] }}" >> $GITHUB_OUTPUT
135136
136137
manifest:
137-
runs-on: ubuntu-22.04
138+
runs-on: ubuntu-latest
138139
if: ${{ github.actor != 'dependabot[bot]' }}
139140
needs: bake
140141
strategy:

.github/workflows/check-and-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ on:
3131

3232
jobs:
3333
check:
34-
runs-on: ubuntu-22.04
34+
runs-on: ubuntu-latest
3535
outputs:
3636
image_release: ${{ steps.build_check.outputs.image_release }}
3737
ls_version: ${{ steps.build_check.outputs.ls_version }}
@@ -172,7 +172,7 @@ jobs:
172172
fi
173173
174174
release:
175-
runs-on: ubuntu-22.04
175+
runs-on: ubuntu-latest
176176
needs: check
177177
if: ${{ needs.check.outputs.update_available == 'true' }}
178178
steps:

.github/workflows/check-baseimage-update.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ on:
2828

2929
jobs:
3030
get-baseimage-version:
31-
runs-on: ubuntu-22.04
31+
runs-on: ubuntu-latest
3232
outputs:
3333
modified: ${{ steps.git-check.outputs.modified }}
3434
steps:
@@ -53,7 +53,7 @@ jobs:
5353
fi
5454
5555
release:
56-
runs-on: ubuntu-22.04
56+
runs-on: ubuntu-latest
5757
needs: get-baseimage-version
5858
if: ${{ needs.get-baseimage-version.outputs.modified == 'true' }}
5959
steps:

0 commit comments

Comments
 (0)