Skip to content

Commit ce5291e

Browse files
committed
Make static runtime default and build with native ARM runners
1 parent 2d9e23f commit ce5291e

File tree

1 file changed

+20
-19
lines changed

1 file changed

+20
-19
lines changed

.github/workflows/main.yml

+20-19
Original file line numberDiff line numberDiff line change
@@ -6,55 +6,56 @@ jobs:
66
build-and-test:
77
strategy:
88
matrix:
9-
ARCH: [x86_64, i386, aarch64, armhf]
10-
USE_STATIC_RUNTIME: [""]
11-
UPDATE: ["1"]
12-
139
include:
14-
# test build
10+
# regular builds:
1511
- ARCH: x86_64
16-
DOCKER_ARCH: amd64
17-
BUILD_TYPE: coverage
12+
BUILD_TYPE: appimage
13+
RUNS_ON: ubuntu-24.04
14+
- ARCH: i386
15+
BUILD_TYPE: appimage
16+
RUNS_ON: ubuntu-24.04
17+
- ARCH: aarch64
18+
BUILD_TYPE: appimage
19+
RUNS_ON: ubuntu-24.04-arm
20+
- ARCH: armhf
21+
BUILD_TYPE: appimage
22+
RUNS_ON: ubuntu-24.04-arm
1823

19-
# experimental build
24+
# test build
2025
- ARCH: x86_64
21-
BUILD_TYPE: appimage
22-
USE_STATIC_RUNTIME: -static
26+
BUILD_TYPE: coverage
27+
RUNS_ON: ubuntu-24.04
2328

2429
fail-fast: false
2530

26-
name: ${{ matrix.ARCH }}${{ matrix.USE_STATIC_RUNTIME }}
27-
runs-on: ubuntu-latest
31+
name: ${{ matrix.ARCH }} ${{ matrix.BUILD_TYPE }}
32+
runs-on: ${{ matrix.RUNS_ON }}
2833

2934
env:
3035
ARCH: ${{ matrix.ARCH }}
3136
BUILD_TYPE: ${{ matrix.BUILD_TYPE }}
3237
DEBIAN_FRONTEND: interactive
33-
USE_STATIC_RUNTIME: ${{ matrix.USE_STATIC_RUNTIME }}
3438

3539
steps:
3640
# check out once git command is available
3741
- uses: actions/checkout@v4
3842
with:
3943
submodules: recursive
4044

41-
- name: Set up QEMU integration for Docker
42-
run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
43-
4445
- name: Build and test AppImage
4546
run: bash ci/build-in-docker.sh
4647

4748
- name: Archive artifacts
4849
uses: actions/upload-artifact@v4
4950
with:
50-
name: AppImage ${{ matrix.ARCH }}${{ matrix.USE_STATIC_RUNTIME}}
51-
path: linuxdeploy-plugin-qt${{ matrix.USE_STATIC_RUNTIME}}-${{ matrix.ARCH }}.AppImage*
51+
name: AppImage ${{ matrix.ARCH }}${{ matrix.BUILD_TYPE }}
52+
path: linuxdeploy-plugin-qt-${{ matrix.ARCH }}.AppImage*
5253

5354
upload:
5455
name: Create release and upload artifacts
5556
needs:
5657
- build-and-test
57-
runs-on: ubuntu-20.04
58+
runs-on: ubuntu-24.04
5859
steps:
5960
- name: Download artifacts
6061
uses: actions/download-artifact@v4

0 commit comments

Comments
 (0)