Skip to content

Commit ac91524

Browse files
authored
Place swift toolchain binaries at start of path (#86)
Updates the various workflows to put swiftc and other swift-toolchain binaries at the start of `$PATH` to avoid being shadowed by preinstalled system tools.
1 parent 8795b3f commit ac91524

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

.github/workflows/build-esp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
run: |
3131
wget -q https://download.swift.org/development/ubuntu2404/${{ matrix.swift }}/${{ matrix.swift }}-ubuntu24.04.tar.gz
3232
tar xzf ${{ matrix.swift }}-ubuntu24.04.tar.gz
33-
export PATH="$PATH:`pwd`/${{ matrix.swift }}-ubuntu24.04/usr/bin/"
33+
export PATH="`pwd`/${{ matrix.swift }}-ubuntu24.04/usr/bin/:$PATH"
3434
echo "PATH=$PATH" >> $GITHUB_ENV
3535
swiftc --version
3636

.github/workflows/build-pico-sdk.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
run: |
4949
wget -q https://download.swift.org/development/ubuntu2404/${{ matrix.swift }}/${{ matrix.swift }}-ubuntu24.04.tar.gz
5050
tar xzf ${{ matrix.swift }}-ubuntu24.04.tar.gz
51-
export PATH="$PATH:`pwd`/${{ matrix.swift }}-ubuntu24.04/usr/bin/"
51+
export PATH="`pwd`/${{ matrix.swift }}-ubuntu24.04/usr/bin/:$PATH"
5252
echo "PATH=$PATH" >> $GITHUB_ENV
5353
which swiftc
5454
swiftc --version

.github/workflows/build-zephyr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111

1212
jobs:
1313
build-zephyr:
14-
runs-on: ubuntu-22.04
14+
runs-on: ubuntu-24.04
1515

1616
strategy:
1717
fail-fast: false
@@ -38,7 +38,7 @@ jobs:
3838
run: |
3939
wget -q https://download.swift.org/development/ubuntu2404/${{ matrix.swift }}/${{ matrix.swift }}-ubuntu24.04.tar.gz
4040
tar xzf ${{ matrix.swift }}-ubuntu24.04.tar.gz
41-
export PATH="$PATH:`pwd`/${{ matrix.swift }}-ubuntu24.04/usr/bin/"
41+
export PATH="`pwd`/${{ matrix.swift }}-ubuntu24.04/usr/bin/:$PATH"
4242
echo "PATH=$PATH" >> $GITHUB_ENV
4343
swiftc --version
4444

0 commit comments

Comments
 (0)