diff --git a/.github/workflows/nightly_snapshot_check.yml b/.github/workflows/nightly_snapshot_check.yml index bf5d79ae..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-dev - 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 6b28c1b9..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-dev - jobs: soundness: name: Soundness diff --git a/scripts/prep-gh-action.sh b/scripts/prep-gh-action.sh index 85a420b6..594edede 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