Skip to content

Commit 88af13c

Browse files
committed
ci: install Swift into container
1 parent 5dc5133 commit 88af13c

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed

.github/workflows/build.yml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@ jobs:
4949
sudo apt-get update
5050
sudo apt-get install pkg-config
5151
52-
- name: Setup Swift
53-
uses: SwiftyLab/setup-swift@latest
54-
with:
55-
development: true
52+
# - name: Setup Swift
53+
# uses: SwiftyLab/setup-swift@latest
54+
# with:
55+
# development: true
5656

57-
- name: Move Swift
58-
run: |
59-
sudo mv /usr/local/bin/swift* /usr/bin/
60-
sudo mv /usr/local/lib/swift /usr/lib/
57+
# - name: Install Swift
58+
# run: |
59+
# sudo mv /usr/local/bin/swift* /usr/bin/
60+
# sudo mv /usr/local/lib/swift /usr/lib/
6161

6262
- name: esp-idf build and merge binaries
6363
uses: espressif/[email protected]
@@ -68,7 +68,11 @@ jobs:
6868
target: ${{ env.TARGET }}
6969
path: '.'
7070
command: |
71-
/usr/local/bin/swift --version
71+
wget https://download.swift.org/development/ubuntu2204/swift-DEVELOPMENT-SNAPSHOT-2024-10-30-a/swift-DEVELOPMENT-SNAPSHOT-2024-10-30-a-ubuntu22.04.tar.gz
72+
tar xzf swift-DEVELOPMENT-SNAPSHOT-2024-10-30-a-ubuntu22.04.tar.gz
73+
export SWIFTC=`pwd`/swift-DEVELOPMENT-SNAPSHOT-2024-10-30-a-ubuntu20.04/usr/bin/swift
74+
export PATH="$PATH:`pwd`/swift-DEVELOPMENT-SNAPSHOT-2024-10-30-a-ubuntu20.04/usr/bin/"
75+
swiftc --version
7276
idf.py @boards/${{ matrix.board }}.cfg build &&
7377
cd build.${{ matrix.board }} &&
7478
esptool.py --chip ${{ env.TARGET }} merge_bin -o ${{ github.event.inputs.prefix }}-${{ matrix.board }}.bin "@flash_args"

0 commit comments

Comments
 (0)