Bump remaining workflows to Ubuntu 24.04

pcolby · Oct 1, 2024 · 6f37b38 · 6f37b38
1 parent 530b408
commit 6f37b38
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 25 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -7,7 +7,7 @@ permissions:
 
 jobs:
   linux:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
@@ -46,22 +46,7 @@ jobs:
       run: sudo apt install qtbase5{,-doc}-dev qtconnectivity5-{dev,doc-html} qttools5-dev{,-tools}
     - name: Install Ubuntu's Qt6
       if: matrix.qt == 6
-      run: |
-        # \todo Add the Qt6 doc packages here when GitHub ugrades to Ubuntu 23.x+
-        sudo apt install qt6-{base-dev{,-tools},connectivity-dev,l10n-tools,tools-dev{,-tools}}
-        # \todo Remove this QT_VERSION env var when GitHub ugrades to Ubuntu 23.x+
-        echo "QT_VERSION=$(/usr/lib/qt6/bin/qtpaths6 --qt-query QT_VERSION)" | tee "$GITHUB_ENV"
-    - name: Install Qt docs
-      # \todo Remove this step when GitHub updates their Ubuntu image. This is only required for Ubuntu 22.04, since
-      # that release is missing the Qt6 documentation packages. Can also remove the above QT_VERSION env var then too.
-      if: matrix.qt == 6
-      uses: jurplel/install-qt-action@v4
-      with:
-        version: ${{ env.QT_VERSION }}
-        no-qt-binaries: true
-        documentation: true
-        doc-archives: 'qtcore'
-        doc-modules: 'qtbluetooth'
+      run: sudo apt install qt6-{base-{dev{,-tools},doc-dev},connectivity-{dev,doc-html},l10n-tools,tools-dev{,-tools}}
     - name: Install online Qt version
       if: contains(matrix.qt, '.') # ie if not using Ubuntu's Qt5/Qt6.
       uses: jurplel/install-qt-action@v4
@@ -472,7 +457,7 @@ jobs:
 
   collate-test-results:
     needs: [ linux, mac, win ]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@v4
     - name: Install lcov
@@ -525,7 +510,7 @@ jobs:
   update-tests-on-doc-branch:
     permissions:
       contents: write
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     if: success() && (github.ref == 'refs/heads/main')
     needs: collate-test-results
     steps:

diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
@@ -10,7 +10,7 @@ env:
 
 jobs:
   generate:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@v4
       with:
@@ -44,7 +44,7 @@ jobs:
   publish:
     permissions:
       contents: write
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     if: success() && (github.ref == 'refs/heads/main')
     needs: generate
     steps:

diff --git a/.github/workflows/labeler.yaml b/.github/workflows/labeler.yaml
@@ -8,7 +8,7 @@ jobs:
     permissions:
       contents: read
       pull-requests: write
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/labeler@v5
         with:

diff --git a/.github/workflows/sonar.yaml b/.github/workflows/sonar.yaml
@@ -13,7 +13,7 @@ permissions:
 
 jobs:
   build-and-scan:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:

diff --git a/.github/workflows/static.yaml b/.github/workflows/static.yaml
@@ -11,7 +11,7 @@ jobs:
       contents: read
       security-events: write
     if: github.actor != 'dependabot[bot]'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@v4
     - name: Install Qt
@@ -32,7 +32,7 @@ jobs:
       uses: github/codeql-action/analyze@v3
 
   Cppcheck:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
     - name: Install Cppcheck
       run: |