Skip to content

Commit cbc8bdc

Browse files
authored
Remove the swiftly bootstrap version (#385)
* Remove the manually updated swiftly bootstrap version
1 parent fb74b77 commit cbc8bdc

File tree

3 files changed

+2
-8
lines changed

3 files changed

+2
-8
lines changed

.github/workflows/nightly_snapshot_check.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ on:
44
schedule:
55
- cron: '30 3 * * *'
66

7-
env:
8-
SWIFTLY_BOOTSTRAP_VERSION: 1.0.1-dev
9-
107
jobs:
118
tests-selfhosted-linux:
129
name: Test (Smoke Test - Nightly Swift Toolchain) / ${{ matrix.container }}

.github/workflows/pull_request.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ on:
66
push:
77
branches: [main]
88

9-
env:
10-
SWIFTLY_BOOTSTRAP_VERSION: 1.0.1-dev
11-
129
jobs:
1310
soundness:
1411
name: Soundness

scripts/prep-gh-action.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ if [ "$installSwiftly" == true ]; then
3131
echo "Installing swiftly"
3232

3333
if [[ "$(uname -s)" == "Linux" ]]; then
34-
curl -O https://download.swift.org/swiftly/linux/swiftly-${SWIFTLY_BOOTSTRAP_VERSION}-$(uname -m).tar.gz && tar zxf swiftly-*.tar.gz && ./swiftly init -y --skip-install
34+
curl -O https://download.swift.org/swiftly/linux/swiftly-$(uname -m).tar.gz && tar zxf swiftly-*.tar.gz && ./swiftly init -y --skip-install
3535
. "/root/.local/share/swiftly/env.sh"
3636
else
3737
export SWIFTLY_HOME_DIR="$(pwd)/swiftly-bootstrap"
3838
export SWIFTLY_BIN_DIR="$SWIFTLY_HOME_DIR/bin"
3939
export SWIFTLY_TOOLCHAINS_DIR="$SWIFTLY_HOME_DIR/toolchains"
4040

41-
curl -O https://download.swift.org/swiftly/darwin/swiftly-${SWIFTLY_BOOTSTRAP_VERSION}.pkg && pkgutil --check-signature swiftly-*.pkg && pkgutil --verbose --expand swiftly-*.pkg "${SWIFTLY_HOME_DIR}" && tar -C "${SWIFTLY_HOME_DIR}" -xvf "${SWIFTLY_HOME_DIR}"/swiftly-*/Payload && "$SWIFTLY_HOME_DIR/bin/swiftly" init -y --skip-install
41+
curl -O https://download.swift.org/swiftly/darwin/swiftly.pkg && pkgutil --check-signature swiftly.pkg && pkgutil --verbose --expand swiftly.pkg "${SWIFTLY_HOME_DIR}" && tar -C "${SWIFTLY_HOME_DIR}" -xvf "${SWIFTLY_HOME_DIR}"/swiftly-*/Payload && "$SWIFTLY_HOME_DIR/bin/swiftly" init -y --skip-install
4242

4343
. "$SWIFTLY_HOME_DIR/env.sh"
4444
fi

0 commit comments

Comments
 (0)