Skip to content

Remove the swiftly bootstrap version #385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 16, 2025
Merged

Remove the swiftly bootstrap version #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
607083e
Bump the self-hosted swiftly version to 1.0.1
cmcgee1024 Jun 16, 2025
adbab98
Remove the manual swiftly bootstrap version
cmcgee1024 Jun 16, 2025
4ff8078
Fix swiftly file name references
cmcgee1024 Jun 16, 2025
86eeed9
Fix the swiftly file name for Linux
cmcgee1024 Jun 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .github/workflows/nightly_snapshot_check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ on:
schedule:
- cron: '30 3 * * *'

env:
SWIFTLY_BOOTSTRAP_VERSION: 1.0.1-dev

jobs:
tests-selfhosted-linux:
name: Test (Smoke Test - Nightly Swift Toolchain) / ${{ matrix.container }}
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/pull_request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ on:
push:
branches: [main]

env:
SWIFTLY_BOOTSTRAP_VERSION: 1.0.1-dev

jobs:
soundness:
name: Soundness
Expand Down
4 changes: 2 additions & 2 deletions scripts/prep-gh-action.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ if [ "$installSwiftly" == true ]; then
echo "Installing swiftly"

if [[ "$(uname -s)" == "Linux" ]]; then
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
curl -O https://download.swift.org/swiftly/linux/swiftly-$(uname -m).tar.gz && tar zxf swiftly-*.tar.gz && ./swiftly init -y --skip-install
. "/root/.local/share/swiftly/env.sh"
else
export SWIFTLY_HOME_DIR="$(pwd)/swiftly-bootstrap"
export SWIFTLY_BIN_DIR="$SWIFTLY_HOME_DIR/bin"
export SWIFTLY_TOOLCHAINS_DIR="$SWIFTLY_HOME_DIR/toolchains"

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
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

. "$SWIFTLY_HOME_DIR/env.sh"
fi
Expand Down