Skip to content

Commit 1b04da1

Browse files
committed
ci: set up swift on ubuntu without setup-swift
1 parent 213db90 commit 1b04da1

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

.github/workflows/swift.yml

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,13 @@ jobs:
3333
os: [ubuntu-22.04]
3434
swift-version: ["6.1"]
3535
steps:
36-
- name: Setup Swift toolchain (action)
37-
id: swift_setup_action
38-
continue-on-error: true
39-
uses: swift-actions/setup-swift@v3
40-
with:
41-
swift-version: ${{ matrix.swift-version }}
42-
- name: Setup Swift toolchain (fallback)
43-
if: ${{ steps.swift_setup_action.outcome != 'success' }}
36+
- name: Setup Swift toolchain
4437
run: |
4538
curl -sL "https://download.swift.org/swift-${{ matrix.swift-version }}-release/ubuntu22.04/swift-${{ matrix.swift-version }}-RELEASE/swift-${{ matrix.swift-version }}-RELEASE-ubuntu22.04.tar.gz" -o swift-toolchain.tar.gz
4639
tar xf swift-toolchain.tar.gz
47-
TOOLCHAIN=$PWD/swift-${{ matrix.swift-version }}-RELEASE-ubuntu22.04/usr
40+
TOOLCHAIN_DIR=$(ls -d swift-${{ matrix.swift-version }}-RELEASE-*/usr | head -n 1)
41+
echo "Resolved toolchain: $TOOLCHAIN_DIR"
42+
TOOLCHAIN=$PWD/${TOOLCHAIN_DIR%/usr}
4843
echo "TOOLCHAIN=$TOOLCHAIN" >> "$GITHUB_ENV"
4944
echo "$TOOLCHAIN/bin" >> "$GITHUB_PATH"
5045
- name: Verify swift toolchain

0 commit comments

Comments
 (0)