Skip to content

Commit 802410c

Browse files
committed
Fix workflow
* Update docker/build-push-action to v6 * Update pr.yml to include 7.1 build in Pull Requests * Update Ubuntu to always use latest LTS
1 parent 2c1675a commit 802410c

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.github/workflows/build.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
- name: Stop Commands
6868
run: T="$(echo -n ${{ github.token }} | sha256sum | head -c 64)" && echo -e "::add-mask::${T}\n::stop-commands::${T}"
6969
- name: Build target base image
70-
uses: docker/build-push-action@v5
70+
uses: docker/build-push-action@v6
7171
with:
7272
context: images/base
7373
pull: true
@@ -136,7 +136,7 @@ jobs:
136136
- name: Stop Commands
137137
run: T="$(echo -n ${{ github.token }} | sha256sum | head -c 64)" && echo -e "::add-mask::${T}\n::stop-commands::${T}"
138138
- name: Build target base image
139-
uses: docker/build-push-action@v5
139+
uses: docker/build-push-action@v6
140140
with:
141141
context: images/base-${{ matrix.target }}
142142
pull: true
@@ -203,7 +203,7 @@ jobs:
203203
key: download-cache-${{ steps.dl_cache.outputs.dltagname }}
204204
fail-on-cache-miss: true
205205
- name: Build target base image
206-
uses: docker/build-push-action@v5
206+
uses: docker/build-push-action@v6
207207
with:
208208
context: .
209209
pull: true

.github/workflows/pr.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ env:
1313
jobs:
1414
build:
1515
name: Test Full Build
16-
runs-on: ubuntu-24.04
16+
runs-on: ubuntu-latest
1717
strategy:
1818
fail-fast: false
1919
matrix:
2020
target: [win64,linux64,linuxarm64]
21-
variant: [lgpl,gpl 6.1,gpl 5.1,lgpl 6.1,lgpl 5.1,gpl-shared,lgpl-shared,gpl-shared 6.1,gpl-shared 5.1,lgpl-shared 6.1,lgpl-shared 5.1]
21+
variant: [gpl,lgpl,gpl 5.1,gpl 6.1,gpl 7.1,lgpl 5.1,lgpl 6.1,lgpl 7.1,gpl-shared,lgpl-shared,gpl-shared 5.1,gpl-shared 6.1,gpl-shared 7.1,lgpl-shared 5.1,lgpl-shared 6.1,lgpl-shared 7.1]
2222
quickbuild: [1]
2323
include:
2424
- target: win64

0 commit comments

Comments
 (0)