Skip to content

Commit 2e46ff4

Browse files
authored
Merge branch 'master' into bump-min-cmake-ver-3.6
2 parents 027b2f5 + f855a8b commit 2e46ff4

File tree

1 file changed

+14
-9
lines changed

1 file changed

+14
-9
lines changed

.github/workflows/main.yml

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,31 @@ jobs:
77
strategy:
88
fail-fast: false
99
matrix:
10-
ARCH: [x86_64, i686, aarch64, armhf]
10+
include:
11+
- ARCH: x86_64
12+
RUNS_ON: ubuntu-24.04
13+
- ARCH: i686
14+
RUNS_ON: ubuntu-24.04
15+
- ARCH: aarch64
16+
RUNS_ON: ubuntu-24.04-arm
17+
- ARCH: armhf
18+
RUNS_ON: ubuntu-24.04-arm
1119

1220
name: AppImage ${{ matrix.ARCH }}
13-
runs-on: ubuntu-20.04
21+
runs-on: ${{ matrix.RUNS_ON }}
1422
env:
1523
ARCH: ${{ matrix.ARCH }}
1624
DIST: bionic
1725
steps:
18-
- uses: actions/checkout@v2
26+
- uses: actions/checkout@v4
1927
with:
2028
submodules: recursive
2129

22-
- name: Set up QEMU integration for Docker
23-
run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
24-
2530
- name: Build AppImage in Docker
2631
run: bash -ex ci/build-in-docker.sh
2732

2833
- name: Archive artifacts
29-
uses: actions/upload-artifact@v2
34+
uses: actions/upload-artifact@v4
3035
with:
3136
name: AppImage ${{ matrix.ARCH }}
3237
path: zsync*.AppImage*
@@ -35,10 +40,10 @@ jobs:
3540
name: Create release and upload artifacts
3641
needs:
3742
- appimage
38-
runs-on: ubuntu-20.04
43+
runs-on: ubuntu-latest
3944
steps:
4045
- name: Download artifacts
41-
uses: actions/download-artifact@v2
46+
uses: actions/download-artifact@v4
4247
- name: Inspect directory after downloading artifacts
4348
run: ls -alFR
4449
- name: Create release and upload artifacts

0 commit comments

Comments
 (0)