Test against ubuntu-24.04

haskell-wasm · May 14, 2024 · ee3616d · ee3616d
1 parent 9f4fd4d
commit ee3616d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -9,8 +9,14 @@ on:
 
 jobs:
   build:
-    name: build
-    runs-on: ubuntu-latest
+    name: build-${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-24.04
+          - ubuntu-22.04
     steps:
 
       - name: checkout

diff --git a/setup.sh b/setup.sh
@@ -9,8 +9,13 @@ curl -f -L --retry 5 https://apt.llvm.org/llvm-snapshot.gpg.key | sudo gpg --dea
 {
   echo "deb [signed-by=/usr/share/keyrings/llvm-snapshot.gpg] https://apt.llvm.org/$LSB_CODENAME llvm-toolchain-$LSB_CODENAME main"
   echo "deb [signed-by=/usr/share/keyrings/llvm-snapshot.gpg] https://apt.llvm.org/$LSB_CODENAME llvm-toolchain-$LSB_CODENAME-18 main"
+} | sudo tee /etc/apt/sources.list.d/llvm-toolchain.list
+
+if [[ $LSB_CODENAME != "noble" ]]; then
+{
   echo "deb [signed-by=/usr/share/keyrings/llvm-snapshot.gpg] https://apt.llvm.org/$LSB_CODENAME llvm-toolchain-$LSB_CODENAME-17 main"
   echo "deb [signed-by=/usr/share/keyrings/llvm-snapshot.gpg] https://apt.llvm.org/$LSB_CODENAME llvm-toolchain-$LSB_CODENAME-16 main"
-} | sudo tee /etc/apt/sources.list.d/llvm-toolchain.list
+} | sudo tee -a /etc/apt/sources.list.d/llvm-toolchain.list
+fi
 
-sudo apt update
+exec sudo apt update