diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2024-02-15 01:06:16 +0300 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2024-02-19 12:12:11 +0000 |
| commit | 29f1c4ffbedec0af912c2260e383785b984ed85e (patch) | |
| tree | 7622ea058f6a301f683306425834cdadd33205cb /.github | |
| parent | bd0c59e572f95953337177e68fa32cb0c4aa1e29 (diff) | |
GitHub actions: switch Linux tests to Jammy
...with the exception of Android, Qt5 and static Qt tests
Change-Id: I0ffe0b119859c33e0086f9dc1173aaf823e5b3fc
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/main.yml | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1947d10d5..d1b4d30ac 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -351,80 +351,93 @@ jobs: matrix: config: - { - name: 'Run Linux tests (gcc)', - image: 'focal', + name: 'Run Linux tests (gcc, Qt 6)', + image: 'jammy-qt6', + suffix: 'linux-jammy', profile: 'qt-gcc_64', script: './scripts/test-qbs.sh', } - { - name: 'Run Linux tests (clang)', - image: 'focal', + name: 'Run Linux tests (clang, Qt 6)', + image: 'jammy-qt6', + suffix: 'linux-jammy', profile: 'qt-clang_64', script: './scripts/test-qbs.sh', } - { - name: 'Run Linux tests (gcc, Qt 6.2)', - image: 'focal-qt6', + name: 'Run Linux tests (gcc, Qt 5)', + image: 'focal-qt5', + suffix: 'linux', profile: 'qt-gcc_64', script: './scripts/test-qt.sh', } - { name: 'Run Linux tests (gcc, Qt 6.5 static)', image: 'focal-qt6-static', + suffix: 'linux', profile: 'qt-gcc_64', script: './scripts/test-qt.sh', } - { name: 'Run Android tests (Qt 5.15)', image: 'focal-android-515', + suffix: 'linux', profile: '', script: './scripts/test-qt-for-android.sh', } - { name: 'Run Android tests (Qt 6.2.0)', image: 'focal-android-620', + suffix: 'linux', profile: '', script: './scripts/test-qt-for-android.sh', } - { name: 'Run Android tests (Qt 6.3.0)', image: 'focal-android-630', + suffix: 'linux', profile: '', script: './scripts/test-qt-for-android.sh', } - { name: 'Run Android tests (Qt 6.4.2)', image: 'focal-android-642', + suffix: 'linux', profile: '', script: './scripts/test-qt-for-android.sh', } - { name: 'Run Android tests (Qt 6.5.0)', image: 'focal-android-650', + suffix: 'linux', profile: '', script: './scripts/test-qt-for-android.sh', } - { name: 'Run Android tests (ndk r19c)', image: 'focal-android-ndk-r19c', + suffix: 'linux', profile: '', script: './scripts/test-for-android.sh', } - { name: 'Run Android tests (ndk r21e)', image: 'focal-android-ndk-r21e', + suffix: 'linux', profile: '', script: './scripts/test-for-android.sh', } - { name: 'Run Android tests (ndk r23)', image: 'focal-android-ndk-r23', + suffix: 'linux', profile: '', script: './scripts/test-for-android.sh', } - { name: 'Run Linux tests (Qt 4.8.7)', image: 'focal-qt4', + suffix: 'linux', profile: '', script: './scripts/test-qt4.sh', } @@ -438,10 +451,10 @@ jobs: - name: Download artifact uses: actions/download-artifact@v1 with: - name: qbs-linux-${{ github.run_id }}.tar.gz + name: qbs-${{ matrix.config.suffix }}-${{ github.run_id }}.tar.gz path: ./ - name: Unpack artifact - run: mkdir -p release/install-root/ && tar xzf qbs-linux-${{ github.run_id }}.tar.gz -C release/install-root/ + run: mkdir -p release/install-root/ && tar xzf qbs-${{ matrix.config.suffix }}-${{ github.run_id }}.tar.gz -C release/install-root/ - name: Pull the Docker Image run: docker-compose pull ${{ matrix.config.image }} - name: Run tests |