GitHub actions: Add Jammy-qt6 job

Change-Id: I38fa9d66a8e136c498f5826e2d3d84fe06bafe89
ABBAPOH · Feb 14, 2024 · 724c0c3 · 724c0c3
1 parent 57368fd
commit 724c0c3
Showing 1 changed file with 20 additions and 6 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -17,13 +17,27 @@ jobs:
         config:
         - {
             name: 'Build on Linux (gcc)',
+            image: 'focal-qt6',
             options: 'modules.cpp.compilerWrapper:ccache
                       modules.qbs.debugInformation:true
                       modules.qbsbuildconfig.enableBundledQt:true
                       products.qbs_archive.targetName:qbs-linux-${{ github.run_id }}
                       products.qbs_archive.includeTests:true',
             script: './scripts/build-qbs-with-qbs.sh',
             cacheid: 'gcc-qt6',
+            suffix: 'linux',
+          }
+        - {
+            name: 'Build on Ubuntu Jammy (gcc)',
+            image: 'jammy-qt6',
+            options: 'modules.cpp.compilerWrapper:ccache
+                      modules.qbs.debugInformation:true
+                      modules.qbsbuildconfig.enableBundledQt:true
+                      products.qbs_archive.targetName:qbs-jammy-${{ github.run_id }}
+                      products.qbs_archive.includeTests:true',
+            script: './scripts/build-qbs-with-qbs.sh',
+            cacheid: 'gcc-qt6-jammy',
+            suffix: 'jammy',
           }
     env:
       BUILD_OPTIONS: ${{ matrix.config.options }}
@@ -42,18 +56,18 @@ jobs:
         key: ${{ runner.os }}-${{ matrix.config.cacheid }}-ccache-${{ steps.get-timestamp.outputs.timestamp }}
         restore-keys: ${{ runner.os }}-${{ matrix.config.cacheid }}-ccache-
     - name: Pull the Docker Image
-      run: docker-compose pull focal-qt6
+      run: docker-compose pull ${{ matrix.config.image }}
     - name: Print ccache stats
-      run: docker-compose run focal-qt6 ccache -s
+      run: docker-compose run ${{ matrix.config.image }} ccache -s
     - name: Build Qbs
-      run: docker-compose run focal-qt6 ${{ matrix.config.script }}
+      run: docker-compose run ${{ matrix.config.image }} ${{ matrix.config.script }}
     - name: Print ccache stats
-      run: docker-compose run focal-qt6 ccache -s
+      run: docker-compose run ${{ matrix.config.image }} ccache -s
     - name: Upload artifacts
       uses: 'actions/upload-artifact@v2'
       with:
-        name: qbs-linux-${{ github.run_id }}.tar.gz
-        path: release/qbs-linux-${{ github.run_id }}.tar.gz
+        name: qbs-${{ matrix.config.suffix }}-${{ github.run_id }}.tar.gz
+        path: release/qbs-${{ matrix.config.suffix }}-${{ github.run_id }}.tar.gz
 
   build-linux-extra:
     name: ${{ matrix.config.name }}