Update build-pico-sdk.yml (#85)

Avoid using docker instead just build directly in an ubuntu 24.04 VM.
apple · Jan 3, 2025 · 34d0bb5 · 34d0bb5
1 parent 8815c9a
commit 34d0bb5
Showing 1 changed file with 18 additions and 9 deletions.
diff --git a/.github/workflows/build-pico-sdk.yml b/.github/workflows/build-pico-sdk.yml
@@ -11,8 +11,7 @@ on:
 
 jobs:
   build-pico-sdk:
-    runs-on: ubuntu-22.04
-    container: swiftlang/swift:nightly-main-jammy
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
@@ -21,13 +20,14 @@ jobs:
             board: pico
           - name: pico-w-blink-sdk
             board: pico_w
+        swift: [swift-DEVELOPMENT-SNAPSHOT-2024-12-04-a]
 
     steps:
       - name: Checkout repo
         uses: actions/checkout@v4
 
       - name: Install apt dependencies
-        run: apt-get -qq update && apt-get -qq -y install curl ninja-build python3
+        run: sudo apt-get -qq update && sudo apt-get -qq -y install curl ninja-build python3
 
       - name: Install CMake 3.30.2
         run: |
@@ -38,19 +38,28 @@ jobs:
           echo "PATH=$PATH" >> $GITHUB_ENV
           cmake --version
 
+      - name: Install GNU ARM toolchain
+        run: |
+          ARCH=`uname -m`
+          curl -sL https://developer.arm.com/-/media/Files/downloads/gnu/13.3.rel1/binrel/arm-gnu-toolchain-13.3.rel1-$ARCH-arm-none-eabi.tar.xz -O
+          tar xf arm-gnu-toolchain-13.3.rel1-$ARCH-arm-none-eabi.tar.xz
+
+      - name: Install ${{ matrix.swift }}
+        run: |
+          wget -q https://download.swift.org/development/ubuntu2404/${{ matrix.swift }}/${{ matrix.swift }}-ubuntu24.04.tar.gz
+          tar xzf ${{ matrix.swift }}-ubuntu24.04.tar.gz
+          export PATH="$PATH:`pwd`/${{ matrix.swift }}-ubuntu24.04/usr/bin/"
+          echo "PATH=$PATH" >> $GITHUB_ENV
+          which swiftc
+          swiftc --version
+
       - name: Clone Pico SDK
         run: |
           git clone https://github.com/raspberrypi/pico-sdk.git
           cd pico-sdk
           git submodule update --init --recursive
           cd ..
 
-      - name: Download GNU ARM toolchain
-        run: |
-          ARCH=`uname -m`
-          curl -sL https://developer.arm.com/-/media/Files/downloads/gnu/13.3.rel1/binrel/arm-gnu-toolchain-13.3.rel1-$ARCH-arm-none-eabi.tar.xz -O
-          tar xf arm-gnu-toolchain-13.3.rel1-$ARCH-arm-none-eabi.tar.xz
-
       - name: Set Pico environment variables
         run: |
           ARCH=`uname -m`