Bump the CI to use ubuntu-24.04

xiph · Dec 26, 2024 · 9e3b849 · 9e3b849
1 parent 26c216f
commit 9e3b849
Showing 1 changed file with 5 additions and 13 deletions.
diff --git a/.github/workflows/rav1e.yml b/.github/workflows/rav1e.yml
@@ -12,7 +12,7 @@ on:
 
 jobs:
   rustfmt-clippy:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - uses: actions/checkout@v4
@@ -30,7 +30,7 @@ jobs:
           args: -- -D warnings
 
   msrv:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     env:
       CARGO_INCREMENTAL: 0
@@ -72,7 +72,7 @@ jobs:
           --no-default-features
 
   wasi:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: [rustfmt-clippy, msrv]
 
     env:
@@ -152,7 +152,7 @@ jobs:
       SCCACHE_DIR: /home/runner/.cache/sccache
       SCCACHE_IDLE_TIMEOUT: 0
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: [rustfmt-clippy, msrv]
 
     steps:
@@ -175,10 +175,8 @@ jobs:
       - name: Install dependencies
         if: matrix.conf != 'dav1d-tests-arm64'
         run: |
-          sudo sed -i 's/jammy/lunar/g' /etc/apt/sources.list
-          sudo rm /etc/apt/sources.list.d/*.list
           sudo apt update
-          sudo apt install nasm libaom-dev meson ninja-build nasm
+          sudo apt install nasm libaom-dev meson ninja-build
       - name: Install cargo-c
         if: matrix.conf == 'cargo-c'
         env:
@@ -206,14 +204,8 @@ jobs:
           rustup component add llvm-tools-preview
       - name: Install aarch64 toolchain, qemu-user and libdav1d deps
         if: matrix.conf == 'dav1d-tests-arm64'
-        env:
-          LINK: http://ports.ubuntu.com/ubuntu-ports/pool
         run: |
           rustup target add aarch64-unknown-linux-gnu
-          { echo 'deb [arch=amd64] http://azure.archive.ubuntu.com/ubuntu lunar main universe'
-            echo 'deb [arch=amd64] http://azure.archive.ubuntu.com/ubuntu lunar-updates main universe'
-            echo 'deb [arch=arm64] http://azure.ports.ubuntu.com/ lunar main universe'
-          } | sudo tee /etc/apt/sources.list
           sudo dpkg --add-architecture arm64
           sudo apt update
           sudo apt install qemu-user gcc-aarch64-linux-gnu meson ninja-build nasm