From 607083ede8c4bb899d3d6ac17813bc9df7d07fcc Mon Sep 17 00:00:00 2001 From: Chris McGee Date: Mon, 16 Jun 2025 10:31:17 -0400 Subject: [PATCH 1/4] Bump the self-hosted swiftly version to 1.0.1 --- .github/workflows/nightly_snapshot_check.yml | 2 +- .github/workflows/pull_request.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nightly_snapshot_check.yml b/.github/workflows/nightly_snapshot_check.yml index bf5d79ae..b803a873 100644 --- a/.github/workflows/nightly_snapshot_check.yml +++ b/.github/workflows/nightly_snapshot_check.yml @@ -5,7 +5,7 @@ on: - cron: '30 3 * * *' env: - SWIFTLY_BOOTSTRAP_VERSION: 1.0.1-dev + SWIFTLY_BOOTSTRAP_VERSION: 1.0.1 jobs: tests-selfhosted-linux: diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 6b28c1b9..e1444514 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -7,7 +7,7 @@ on: branches: [main] env: - SWIFTLY_BOOTSTRAP_VERSION: 1.0.1-dev + SWIFTLY_BOOTSTRAP_VERSION: 1.0.1 jobs: soundness: From adbab985b639986fbedcc59bb102bfa7a747830f Mon Sep 17 00:00:00 2001 From: Chris McGee Date: Mon, 16 Jun 2025 10:34:13 -0400 Subject: [PATCH 2/4] Remove the manual swiftly bootstrap version --- .github/workflows/nightly_snapshot_check.yml | 3 --- .github/workflows/pull_request.yml | 3 --- scripts/prep-gh-action.sh | 4 ++-- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/nightly_snapshot_check.yml b/.github/workflows/nightly_snapshot_check.yml index b803a873..4d706545 100644 --- a/.github/workflows/nightly_snapshot_check.yml +++ b/.github/workflows/nightly_snapshot_check.yml @@ -4,9 +4,6 @@ on: schedule: - cron: '30 3 * * *' -env: - SWIFTLY_BOOTSTRAP_VERSION: 1.0.1 - jobs: tests-selfhosted-linux: name: Test (Smoke Test - Nightly Swift Toolchain) / ${{ matrix.container }} diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index e1444514..31831e76 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -6,9 +6,6 @@ on: push: branches: [main] -env: - SWIFTLY_BOOTSTRAP_VERSION: 1.0.1 - jobs: soundness: name: Soundness diff --git a/scripts/prep-gh-action.sh b/scripts/prep-gh-action.sh index 85a420b6..0d9e0f23 100755 --- a/scripts/prep-gh-action.sh +++ b/scripts/prep-gh-action.sh @@ -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 From 4ff807893b86277dd99bfad8afa67aeec4116732 Mon Sep 17 00:00:00 2001 From: Chris McGee Date: Mon, 16 Jun 2025 10:36:21 -0400 Subject: [PATCH 3/4] Fix swiftly file name references --- scripts/prep-gh-action.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/prep-gh-action.sh b/scripts/prep-gh-action.sh index 0d9e0f23..33c2a5a4 100755 --- a/scripts/prep-gh-action.sh +++ b/scripts/prep-gh-action.sh @@ -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-$(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.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 From 86eeed910aa943d19d6954eaf7d47d1effc8140b Mon Sep 17 00:00:00 2001 From: Chris McGee Date: Mon, 16 Jun 2025 10:37:34 -0400 Subject: [PATCH 4/4] Fix the swiftly file name for Linux --- scripts/prep-gh-action.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/prep-gh-action.sh b/scripts/prep-gh-action.sh index 33c2a5a4..594edede 100755 --- a/scripts/prep-gh-action.sh +++ b/scripts/prep-gh-action.sh @@ -31,7 +31,7 @@ if [ "$installSwiftly" == true ]; then echo "Installing swiftly" if [[ "$(uname -s)" == "Linux" ]]; then - curl -O https://download.swift.org/swiftly/linux/swiftly-$(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"