aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/main.yml20
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