Update ubuntu version

nacs-lab · Dec 7, 2024 · b0ed379 · b0ed379
1 parent cac4974
commit b0ed379
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 24 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -63,17 +63,21 @@ jobs:
 
     - name: Create ubuntu package tarball
       run: |
-        mkdir ubuntu-18.04-packages
-        mv *-package-ubuntu-18.04/*.deb ubuntu-18.04-packages/
-        tar -cvf ubuntu-18.04-packages.tar.zst --zstd ubuntu-18.04-packages/
-
         mkdir ubuntu-20.04-packages
         mv *-package-ubuntu-20.04/*.deb ubuntu-20.04-packages/
         tar -cvf ubuntu-20.04-packages.tar.zst --zstd ubuntu-20.04-packages/
 
+        mkdir ubuntu-22.04-packages
+        mv *-package-ubuntu-22.04/*.deb ubuntu-22.04-packages/
+        tar -cvf ubuntu-22.04-packages.tar.zst --zstd ubuntu-22.04-packages/
+
+        mkdir ubuntu-24.04-packages
+        mv *-package-ubuntu-24.04/*.deb ubuntu-24.04-packages/
+        tar -cvf ubuntu-24.04-packages.tar.zst --zstd ubuntu-24.04-packages/
+
     - name: Tag release
       uses: ncipollo/release-action@v1
       with:
-        artifacts: archlinux-packages.tar.zst,archlinux-arm-packages.tar.zst,msys2-packages.zip,ubuntu-18.04-packages.tar.zst,ubuntu-20.04-packages.tar.zst
+        artifacts: archlinux-packages.tar.zst,archlinux-arm-packages.tar.zst,msys2-packages.zip,ubuntu-20.04-packages.tar.zst,ubuntu-22.04-packages.tar.zst,ubuntu-24.04-packages.tar.zst
         body: Packages
         token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -15,10 +15,12 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - UBUNTU_VER: 18.04
-            LLVM_VER: 10
           - UBUNTU_VER: 20.04
             LLVM_VER: 11
+          - UBUNTU_VER: 22.04
+            LLVM_VER: 15
+          - UBUNTU_VER: 24.04
+            LLVM_VER: 18
 
     env:
       UBUNTU_VER: ${{matrix.UBUNTU_VER}}
@@ -33,11 +35,7 @@ jobs:
         path: ubuntu/libnacs/libnacs
 
     - name: Install dependencies
-      run: sudo apt-get install libopenlibm-dev ${{matrix.UBUNTU_VER != '18.04' && 'libsleef-dev' || ''}} libzmq3-dev libyaml-cpp-dev libtbb-dev llvm-${{matrix.LLVM_VER}}-dev
-
-    - name: Fix zmq include path
-      if: ${{matrix.UBUNTU_VER == '18.04'}} # zmq returns a non-existing include path
-      run: sudo mkdir -p /usr/lib/x86_64-linux-gnu/pgm-5.2/include
+      run: sudo apt-get install libopenlibm-dev libsleef-dev libzmq3-dev libyaml-cpp-dev libtbb-dev llvm-${{matrix.LLVM_VER}}-dev
 
     - name: Create package
       working-directory: ${{github.workspace}}/ubuntu/libnacs
@@ -57,10 +55,12 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - UBUNTU_VER: 18.04
-            LLVM_VER: 10
           - UBUNTU_VER: 20.04
             LLVM_VER: 11
+          - UBUNTU_VER: 22.04
+            LLVM_VER: 15
+          - UBUNTU_VER: 24.04
+            LLVM_VER: 18
 
     env:
       UBUNTU_VER: ${{matrix.UBUNTU_VER}}
@@ -104,18 +104,24 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - UBUNTU_VER: 18.04
-            LLVM_VER: 10
-            NODE_VER: 14
           - UBUNTU_VER: 20.04
             LLVM_VER: 11
-            NODE_VER: 14
-          - UBUNTU_VER: 18.04
-            LLVM_VER: 10
-            NODE_VER: 16
+            NODE_VER: 20
+          - UBUNTU_VER: 22.04
+            LLVM_VER: 15
+            NODE_VER: 20
+          - UBUNTU_VER: 24.04
+            LLVM_VER: 18
+            NODE_VER: 20
           - UBUNTU_VER: 20.04
             LLVM_VER: 11
-            NODE_VER: 16
+            NODE_VER: 22
+          - UBUNTU_VER: 22.04
+            LLVM_VER: 15
+            NODE_VER: 22
+          - UBUNTU_VER: 24.04
+            LLVM_VER: 18
+            NODE_VER: 22
 
     env:
       UBUNTU_VER: ${{matrix.UBUNTU_VER}}
@@ -132,7 +138,7 @@ jobs:
         fetch-depth: 0 # for version/hash computation
 
     - name: Install dependencies
-      run: sudo apt-get install libopenlibm-dev ${{matrix.UBUNTU_VER != '18.04' && 'libsleef-dev' || ''}} libzmq3-dev libyaml-cpp-dev libtbb-dev llvm-${{matrix.LLVM_VER}}-dev
+      run: sudo apt-get install libopenlibm-dev libsleef-dev libzmq3-dev libyaml-cpp-dev libtbb-dev llvm-${{matrix.LLVM_VER}}-dev
 
     - name: Install NodeJS
       run: |
@@ -165,8 +171,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - UBUNTU_VER: 18.04
           - UBUNTU_VER: 20.04
+          - UBUNTU_VER: 22.04
+          - UBUNTU_VER: 24.04
 
     env:
       UBUNTU_VER: ${{matrix.UBUNTU_VER}}