diff options
author | Ivan Komissarov <ABBAPOH@gmail.com> | 2024-02-24 13:27:46 +0100 |
---|---|---|
committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2024-02-26 10:41:52 +0000 |
commit | 1fd6b5623bafd38415a5f965473e1dd5a1543ade (patch) | |
tree | 093e7a79776ff171ec31c7bc4c5be61997882100 /.github | |
parent | 650c2727ad24074a431e893a8d7595aa6d94d683 (diff) |
GutHub actions: fix archive suffixes
This amends f31b3fe24d1dbd92e47b050df68d3a5b8aa286ae,
569f804a75c045785a626f2cc8806af9e5ae5978 and
60a18f09fa547af064fb851e72b816ee25bf71a3.
Change-Id: Idfc923e21b7e64024032fe4b929abc53562d127e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to '.github')
-rw-r--r-- | .github/workflows/main.yml | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6ccd36047..fd42884de 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -367,7 +367,7 @@ jobs: - { name: 'Run Linux tests (gcc, Qt 5)', image: 'jammy-qt5', - suffix: 'linux', + suffix: 'linux-jammy', profile: 'qt-gcc_64', script: './scripts/test-qt.sh', } @@ -381,49 +381,49 @@ jobs: - { name: 'Run Android tests (Qt 5.15)', image: 'jammy-android-515', - suffix: 'linux', + suffix: 'linux-jammy', profile: '', script: './scripts/test-qt-for-android.sh', } - { name: 'Run Android tests (Qt 6.2)', image: 'jammy-android-62', - suffix: 'linux', + suffix: 'linux-jammy', profile: '', script: './scripts/test-qt-for-android.sh', } - { name: 'Run Android tests (Qt 6.5)', image: 'jammy-android-65', - suffix: 'linux', + suffix: 'linux-jammy', profile: '', script: './scripts/test-qt-for-android.sh', } - { name: 'Run Android tests (ndk r19c)', image: 'jammy-android-ndk-r19c', - suffix: 'linux', + suffix: 'linux-jammy', profile: '', script: './scripts/test-for-android.sh', } - { name: 'Run Android tests (ndk r21e)', image: 'jammy-android-ndk-r21e', - suffix: 'linux', + suffix: 'linux-jammy', profile: '', script: './scripts/test-for-android.sh', } - { name: 'Run Android tests (ndk r23)', image: 'jammy-android-ndk-r23', - suffix: 'linux', + suffix: 'linux-jammy', profile: '', script: './scripts/test-for-android.sh', } - { name: 'Run Linux tests (Qt 4.8.7)', image: 'jammy-qt4', - suffix: 'linux', + suffix: 'linux-jammy', profile: '', script: './scripts/test-qt4.sh', } @@ -458,10 +458,10 @@ jobs: - name: Download artifact uses: actions/download-artifact@v1 with: - name: qbs-linux-${{ github.run_id }}.tar.gz + name: qbs-linux-jammy-${{ 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-linux-jammy-${{ github.run_id }}.tar.gz -C release/install-root/ - name: Pull the Docker Image run: docker-compose pull jammy-baremetal - name: arm-none-eabi-gcc-10_3 |