Skip to content

Commit 6788d0b

Browse files
authored
GHA: repair the Ubuntu environment
Correct variable substitution to repair the Ubuntu usage of the task. Furthermore, enable testing on the Ubuntu runner as well.
1 parent cd348eb commit 6788d0b

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.github/workflows/test-install.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
strategy:
99
fail-fast: false
1010
matrix:
11-
os: [macos-latest, windows-latest] # ubuntu-latest is not working at the moment
11+
os: [macos-latest, windows-latest, ubuntu-latest]
1212

1313
name: Test Swift toolchain install on ${{ matrix.os }}
1414
runs-on: ${{ matrix.os }}

action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ runs:
255255
if [[ "${{ steps.validation.outputs.use_custom_url }}" == "1" ]]; then
256256
mv "${{ inputs.release-asset-name }}" swift-toolchain.tar.gz
257257
else
258-
curl -sL https://download.swift.org/${{ inputs.branch }}/ubuntu${release/./}/swift-${{ inputs.tag }}/swift-${{ inputs.tag }}-ubuntu${release}.tar.gz -o swift-toolchain.tar.gz
258+
curl -sL https://download.swift.org/${{ inputs.branch }}/ubuntu${VERSION_ID/./}/swift-${{ inputs.tag }}/swift-${{ inputs.tag }}-ubuntu${VERSION_ID}.tar.gz -o swift-toolchain.tar.gz
259259
fi
260260
tar zxf swift-toolchain.tar.gz -C ${HOME}
261261
rm -f swift-toolchain.tar.gz

0 commit comments

Comments
 (0)