Skip to content

Commit cd33db3

Browse files
committed
Enable arm64 Linux builds
1 parent 774eec6 commit cd33db3

File tree

1 file changed

+14
-23
lines changed

1 file changed

+14
-23
lines changed

.github/workflows/linux-build.yml

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,18 @@ jobs:
1212
runs-on: ubuntu-20.04
1313
strategy:
1414
matrix:
15-
qt-version: ['6.8']
16-
qt-target: ['desktop']
17-
qt-modules: ['']
18-
arch: ['amd64']
19-
ubuntu-version: ['20.04']
15+
include:
16+
- qt-host: 'linux_arm64'
17+
qt-version: '6.8'
18+
qt-target: 'desktop'
19+
qt-modules: ''
20+
qt-arch: 'linux_gcc_64'
21+
arch: 'amd64'
22+
- qt-version: '6.8'
23+
qt-target: 'desktop'
24+
qt-modules: ''
25+
qt-arch: 'linux_gcc_arm64'
26+
arch: 'aarch64'
2027
steps:
2128
- uses: actions/checkout@v3
2229
with:
@@ -47,26 +54,10 @@ jobs:
4754
uses: jurplel/install-qt-action@v4
4855
with:
4956
version: ${{ matrix.qt-version }}
50-
host: 'linux'
51-
arch: 'linux_gcc_64'
57+
host: ${{ matrix.qt-host}}
58+
arch: ${{ matrix.qt-arch }}
5259
target: ${{ matrix.qt-target }}
5360
modules: ${{ matrix.qt-modules }}
54-
- if: "!contains(matrix.arch, 'amd64')"
55-
name: Restore cross-compiled Qt from cache
56-
id: cache-qt-cross
57-
uses: actions/cache@v3
58-
with:
59-
path: |
60-
./qt-host/
61-
./qt-cross/
62-
./sysroot/
63-
key: qt-cross-${{ runner.os }}-${{ matrix.qt-version }}-${{ matrix.qt-target }}-${{ matrix.qt-modules }}-${{ matrix.arch }}
64-
restore-keys:
65-
qt-cross-${{ runner.os }}-${{ matrix.qt-version }}-${{ matrix.qt-target }}-${{ matrix.qt-modules }}-${{ matrix.arch }}
66-
- if: "!contains(matrix.arch, 'amd64') && steps.cache-qt-cross.outputs.cache-hit != 'true'"
67-
name: Cross-compile Qt
68-
shell: bash
69-
run: .ci/build_qt6.sh "${{ matrix.qt-version }}" "${{ matrix.qt-modules }}" "${{ matrix.arch }}"
7061
## Build
7162
- if: "!contains(matrix.arch, 'amd64')"
7263
name: Prepare cross-compilation environment

0 commit comments

Comments
 (0)