[ci] adding ubuntu 24.04

julien-tierny · Sep 9, 2024 · d7bbc7d · d7bbc7d
1 parent 936002a
commit d7bbc7d
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 4 deletions.
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
@@ -24,7 +24,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04, ubuntu-22.04]
+        os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04]
     steps:
     - uses: actions/checkout@v4
       name: Checkout TTK source code
@@ -99,7 +99,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04, ubuntu-22.04]
+        os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04]
     steps:
     - uses: actions/checkout@v4
       name: Checkout TTK source code
@@ -126,6 +126,12 @@ jobs:
         # pvpython does not embed the correct PYTHONPATH
         echo "PYTHONPATH=/usr/lib/python3/dist-packages:$PYTHONPATH" >> $GITHUB_ENV
 
+    - name: Set PYTHONPATH for Ubuntu 24.04 pvpython
+      if: matrix.os == 'ubuntu-24.04'
+      run: |
+        # pvpython does not embed the correct PYTHONPATH
+        echo "PYTHONPATH=/usr/lib/python3/dist-packages:$PYTHONPATH" >> $GITHUB_ENV
+
     - name: Run TTK tests
       uses: ./.github/actions/test-ttk-unix
 
@@ -570,6 +576,14 @@ jobs:
         file: ttk-ubuntu-22.04.deb/ttk.deb
         asset_name: ttk-$tag-ubuntu-22.04.deb
 
+    - name: Upload Ubuntu Noble Numbat .deb as Release Asset
+      uses: svenstaro/upload-release-action@v2
+      with:
+        repo_token: ${{ secrets.GITHUB_TOKEN }}
+        tag: ${{ github.ref }}
+        file: ttk-ubuntu-24.04.deb/ttk.deb
+        asset_name: ttk-$tag-ubuntu-24.04.deb
+
     - name: Upload macOS binary archives as Release Asset
       uses: svenstaro/upload-release-action@v2
       with:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -39,7 +39,7 @@ jobs:
     if: ${{ github.repository_owner == 'topology-tool-kit' || !contains(github.ref, 'heads') }}
     strategy:
       matrix:
-        os: [ubuntu-20.04, ubuntu-22.04]
+        os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04]
     env:
       CCACHE_DIR: /home/runner/.ccache
       CCACHE_MAXSIZE: 500M
@@ -163,7 +163,7 @@ jobs:
     needs: test-build-ubuntu
     strategy:
       matrix:
-        os: [ubuntu-20.04, ubuntu-22.04]
+        os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04]
         testSet: [pyTests, screenshotTests]
     steps:
     - name: Install Ubuntu dependencies
@@ -685,6 +685,14 @@ jobs:
         file: ttk-ccache-ubuntu-22.04/ttk-ccache.tar.gz
         asset_name: ttk-ccache-ubuntu-22.04.tar.gz
 
+    - name: Upload Ubuntu Nobel Numbat .deb as Release Asset
+      uses: svenstaro/upload-release-action@v2
+      with:
+        repo_token: ${{ secrets.GITHUB_TOKEN }}
+        tag: ccache
+        file: ttk-ccache-ubuntu-24.04/ttk-ccache.tar.gz
+        asset_name: ttk-ccache-ubuntu-24.04.tar.gz
+
     - name: Upload .pkg as Release Asset
       uses: svenstaro/upload-release-action@v2
       with: