Run on ubuntu-24.04

andrewdavidmackenzie · Jan 17, 2025 · 443598d · 443598d
1 parent 850d9e7
commit 443598d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -44,7 +44,7 @@ jobs:
         run: cargo check-all-features
 
   arm7-build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Clean up files
         run: |
@@ -68,7 +68,7 @@ jobs:
         run: cargo build --target=armv7-unknown-linux-gnueabihf
 
   arm7-musl-build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Clean up files
         run: |
@@ -92,7 +92,7 @@ jobs:
         run: RUSTFLAGS= cargo build --target=armv7-unknown-linux-musleabihf
 
   aarch64-build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Clean up files
         run: |

diff --git a/dist-workspace.toml b/dist-workspace.toml
@@ -22,14 +22,15 @@ install-path = "CARGO_HOME"
 # Whether to install an updater program
 install-updater = false
 github-build-setup = "../install-arm-linkers.yml"
-include = ["70.pigg.rules"] # udev rules file for USB access on Linux
+# Extra static files to include in each App (path relative to this Cargo.toml's dir)
+include = ["70.pigg.rules"]
 
 [dist.github-custom-runners]
 aarch64-apple-darwin = "macos-14"
 x86_64-apple-darwin = "macos-13"
-x86_64-unknown-linux-gnu = "ubuntu-latest"
+x86_64-unknown-linux-gnu = "ubuntu-24.04"
 x86_64-pc-windows-msvc = "windows-latest"
-armv7-unknown-linux-musleabihf = "ubuntu-latest"
+armv7-unknown-linux-musleabihf = "ubuntu-24.04"
 
 [[dist.extra-artifacts]]
 artifacts = ["porky/target/thumbv6m-none-eabi/release/porky_pico_w.uf2", "porky/target/thumbv6m-none-eabi/release/porky_pico.uf2"]