Add Ubuntu 24.04 to CI & release assets

brndnmtthws · Jun 11, 2024 · 114ed4a · 114ed4a
1 parent 31590dd
commit 114ed4a
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 15 deletions.
diff --git a/.github/workflows/build-and-test-linux.yaml b/.github/workflows/build-and-test-linux.yaml
@@ -12,16 +12,19 @@ on:
     paths-ignore:
       - web/**
       - doc/**
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+
+# concurrency:
+#   group: ${{ github.workflow }}-${{ github.ref }}
+#   cancel-in-progress: true
+
 jobs:
   build:
     strategy:
       matrix:
         os:
           - ubuntu-20.04
           - ubuntu-22.04
+          - ubuntu-24.04
         x11: [ON, OFF]
         wayland: [ON, OFF]
         compiler:
@@ -35,18 +38,23 @@ jobs:
           - 13
           - 14
           - 15
+          - 16
+          - 17
+          - 18
         exclude:
           # 9 only exists for gcc
           - compiler: clang
             compiler_version: 9
 
-          # 13, 14, 15 only exist for clang
+          # 15, 16, 17, 18 only exist for clang
           - compiler: gcc
-            compiler_version: 13
+            compiler_version: 15
           - compiler: gcc
-            compiler_version: 14
+            compiler_version: 16
           - compiler: gcc
-            compiler_version: 15
+            compiler_version: 17
+          - compiler: gcc
+            compiler_version: 18
 
           # ubuntu-20.04
           - os: ubuntu-20.04
@@ -55,6 +63,12 @@ jobs:
           - os: ubuntu-20.04
             compiler: gcc
             compiler_version: 12
+          - os: ubuntu-20.04
+            compiler: gcc
+            compiler_version: 13
+          - os: ubuntu-20.04
+            compiler: gcc
+            compiler_version: 14
           - os: ubuntu-20.04
             compiler: clang
             compiler_version: 13
@@ -64,6 +78,15 @@ jobs:
           - os: ubuntu-20.04
             compiler: clang
             compiler_version: 15
+          - os: ubuntu-20.04
+            compiler: clang
+            compiler_version: 16
+          - os: ubuntu-20.04
+            compiler: clang
+            compiler_version: 17
+          - os: ubuntu-20.04
+            compiler: clang
+            compiler_version: 18
 
           # ubuntu-22.04
           - os: ubuntu-22.04
@@ -75,6 +98,9 @@ jobs:
           - os: ubuntu-22.04
             compiler: clang
             compiler_version: 12
+          - os: ubuntu-22.04
+            compiler: clang
+            compiler_version: 13
     runs-on: ${{ matrix.os }}
     steps:
       - run: sudo apt-get -qq update
@@ -116,11 +142,17 @@ jobs:
             ninja-build \
             wayland-protocols
       - name: Install libc++
-        if: matrix.compiler == 'clang'
+        if: matrix.compiler == 'clang' && matrix.os != 'ubuntu-22.04'
         run: |
           sudo apt-get install -yqq --no-install-recommends \
             libc++-${{ matrix.compiler_version }}-dev \
             libc++abi-${{ matrix.compiler_version }}-dev
+      - name: Install libc++
+        if: matrix.compiler == 'clang' && matrix.os == 'ubuntu-22.04'
+        run: |
+          sudo apt-get install -yqq --no-install-recommends \
+            libc++1-${{ matrix.compiler_version }}-dev \
+            libc++abi1-${{ matrix.compiler_version }}-dev
       - name: Checkout
         uses: actions/checkout@v4
       - name: Configure with CMake

diff --git a/.github/workflows/publish-appimage.yml b/.github/workflows/publish-appimage.yml
@@ -12,9 +12,9 @@ on:
     branches:
       - main
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+# concurrency:
+#   group: ${{ github.workflow }}-${{ github.ref }}
+#   cancel-in-progress: true
 
 jobs:
   build:
@@ -25,6 +25,7 @@ jobs:
         os:
           - ubuntu-20.04
           - ubuntu-22.04
+          - ubuntu-24.04
         arch:
           - x86_64
     permissions:
@@ -69,14 +70,17 @@ jobs:
             ncurses-dev \
             ninja-build \
             pandoc \
-            python3 \
-            wayland-protocols \
-            &&
-            pip3 install --upgrade pyyaml
+            wayland-protocols
       - name: Checkout
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.12'
+          cache: 'pip' # caching pip dependencies
+          cache-dependency-path: 'requirements-dev.txt'
+      - run: pip install -r requirements-dev.txt
       - name: Import GPG Deploy Key
         # only run on main branch
         if: github.ref == 'refs/heads/main'
@@ -91,6 +95,10 @@ jobs:
         if: matrix.os == 'ubuntu-22.04'
         run: |
           echo "CLANG_VERSION=15" | tee -a $GITHUB_ENV
+      - name: Set clang version to 18 for ubuntu-24.04
+        if: matrix.os == 'ubuntu-24.04'
+        run: |
+          echo "CLANG_VERSION=18" | tee -a $GITHUB_ENV
       - name: Install libc++, set CC and CXX env vars
         run: |
           sudo apt-get install -yqq --no-install-recommends \

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -0,0 +1,2 @@
+pyyaml
+jinja2