From 5bcc322c1847256122e9574695d4f67af2de00e5 Mon Sep 17 00:00:00 2001 From: Rauhul Varma Date: Thu, 2 Jan 2025 23:53:33 -0800 Subject: [PATCH 1/2] put downloaded swiftc bins at front of path --- .github/workflows/build-esp.yml | 2 +- .github/workflows/build-pico-sdk.yml | 2 +- .github/workflows/build-zephyr.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-esp.yml b/.github/workflows/build-esp.yml index 0def652e..43a216c0 100644 --- a/.github/workflows/build-esp.yml +++ b/.github/workflows/build-esp.yml @@ -30,7 +30,7 @@ jobs: 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/" + export PATH="`pwd`/${{ matrix.swift }}-ubuntu24.04/usr/bin/:$PATH" echo "PATH=$PATH" >> $GITHUB_ENV swiftc --version diff --git a/.github/workflows/build-pico-sdk.yml b/.github/workflows/build-pico-sdk.yml index 06283bd6..7f3ff5c8 100644 --- a/.github/workflows/build-pico-sdk.yml +++ b/.github/workflows/build-pico-sdk.yml @@ -48,7 +48,7 @@ jobs: 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/" + export PATH="`pwd`/${{ matrix.swift }}-ubuntu24.04/usr/bin/:$PATH" echo "PATH=$PATH" >> $GITHUB_ENV which swiftc swiftc --version diff --git a/.github/workflows/build-zephyr.yml b/.github/workflows/build-zephyr.yml index 0233f150..95e4cdab 100644 --- a/.github/workflows/build-zephyr.yml +++ b/.github/workflows/build-zephyr.yml @@ -38,7 +38,7 @@ jobs: 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/" + export PATH="`pwd`/${{ matrix.swift }}-ubuntu24.04/usr/bin/:$PATH" echo "PATH=$PATH" >> $GITHUB_ENV swiftc --version From 23b388bce5de35bc9485318075252a5ea3596072 Mon Sep 17 00:00:00 2001 From: Rauhul Varma Date: Fri, 3 Jan 2025 00:09:45 -0800 Subject: [PATCH 2/2] Update build-zephyr.yml --- .github/workflows/build-zephyr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-zephyr.yml b/.github/workflows/build-zephyr.yml index 95e4cdab..718372fa 100644 --- a/.github/workflows/build-zephyr.yml +++ b/.github/workflows/build-zephyr.yml @@ -11,7 +11,7 @@ on: jobs: build-zephyr: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 strategy: fail-fast: false