From 8a585eab5a557d6c766d0310e6a0fbb0896f3bf2 Mon Sep 17 00:00:00 2001 From: "Jesse L. Zamora" Date: Sun, 9 Mar 2025 11:22:01 -0400 Subject: [PATCH] Update SWIFT_VERSION to 5.10.1 --- .github/workflows/build-swift-latest.yml | 4 ++-- .github/workflows/build-swift-release.yml | 6 +++--- README.md | 8 ++++---- swift-builder/build-gh-runner.sh | 2 +- swift-builder/swift-builder-common | 2 +- swift-define | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-swift-latest.yml b/.github/workflows/build-swift-latest.yml index 830dc66..776ad95 100644 --- a/.github/workflows/build-swift-latest.yml +++ b/.github/workflows/build-swift-latest.yml @@ -17,8 +17,8 @@ jobs: - swift-target-arch: "armv6" distribution: "raspios-bookworm" env: - SWIFT_VERSION: "6.0.3" - SWIFT_TAG: swift-6.0.3-RELEASE + SWIFT_VERSION: "5.10.1" + SWIFT_TAG: swift-5.10.1-RELEASE name: Build Swift runs-on: ubuntu-latest steps: diff --git a/.github/workflows/build-swift-release.yml b/.github/workflows/build-swift-release.yml index cd2a865..6afa790 100644 --- a/.github/workflows/build-swift-release.yml +++ b/.github/workflows/build-swift-release.yml @@ -2,11 +2,11 @@ name: Build Swift Release on: push: - branches: [ "release/6.0.3" ] + branches: [ "release/5.10.1" ] env: - SWIFT_VERSION: "6.0.3" - SWIFT_TAG: swift-6.0.3-RELEASE + SWIFT_VERSION: "5.10.1" + SWIFT_TAG: swift-5.10.1-RELEASE SWIFT_WORKSPACE_CACHE: swift-workspace jobs: diff --git a/README.md b/README.md index 207b5f7..7c9ac19 100644 --- a/README.md +++ b/README.md @@ -77,14 +77,14 @@ After building the armv7 runtime using the `build.sh` script, you can generate a using the `build-linux-cross-sdk.sh` script. You must provide the swift tag and distribution name: ```bash -./build-linux-cross-sdk.sh swift-6.0.3-RELEASE ubuntu-noble +./build-linux-cross-sdk.sh swift-5.10.1-RELEASE ubuntu-noble ``` By default, the SDK will be generated to be installed at a path of /opt/$SWIFT_TAG-$DISTRIBUTION-armv7, but this can be customized by providing a different install prefix to the script: ```bash export SDK_INSTALL_PREFIX=/home/myuser/swift-sdks -./build-linux-cross-sdk.sh swift-6.0.3-RELEASE ubuntu-noble +./build-linux-cross-sdk.sh swift-5.10.1-RELEASE ubuntu-noble ``` ## Continuous Integration & Releases @@ -101,11 +101,11 @@ To use the SDK that is generated by the CI or published to the [Releases](https: extract it to /opt: ```bash -sudo tar -xf swift-6.0.3-RELEASE-debian-bookworm-armv7-sdk.tar.gz -C /opt +sudo tar -xf swift-5.10.1-RELEASE-debian-bookworm-armv7-sdk.tar.gz -C /opt ``` Then, from a Swift package, use the `--destination` paramter to cross-compile it for the target: ```bash -swift build --destination /opt/swift-6.0.3-RELEASE-debian-bookworm-armv7/debian-bookworm.json +swift build --destination /opt/swift-5.10.1-RELEASE-debian-bookworm-armv7/debian-bookworm.json ``` diff --git a/swift-builder/build-gh-runner.sh b/swift-builder/build-gh-runner.sh index 2051f0b..b08a4d5 100755 --- a/swift-builder/build-gh-runner.sh +++ b/swift-builder/build-gh-runner.sh @@ -1,7 +1,7 @@ #!/bin/bash if [ -z $SWIFT_VERSION ]; then - echo "You must provide a Swift version (such as 6.0.3) to this script!" + echo "You must provide a Swift version (such as 5.10.1) to this script!" exit -1 fi diff --git a/swift-builder/swift-builder-common b/swift-builder/swift-builder-common index cf7624f..b68bd30 100644 --- a/swift-builder/swift-builder-common +++ b/swift-builder/swift-builder-common @@ -1,4 +1,4 @@ -SWIFT_VERSION=${SWIFT_VERSION:=6.0.3} +SWIFT_VERSION=${SWIFT_VERSION:=5.10.1} SWIFT_BRANCH=${SWIFT_BRANCH:=swift-${SWIFT_VERSION}-release} SWIFT_TAG=${SWIFT_TAG:=swift-${SWIFT_VERSION}-RELEASE} diff --git a/swift-define b/swift-define index 8be564a..29d8d94 100644 --- a/swift-define +++ b/swift-define @@ -1,5 +1,5 @@ # Version -SWIFT_VERSION=${SWIFT_VERSION:=swift-6.0.3-RELEASE} +SWIFT_VERSION=${SWIFT_VERSION:=swift-5.10.1-RELEASE} SWIFT_TARGET_ARCH=${SWIFT_TARGET_ARCH:=armv7} case ${SWIFT_TARGET_ARCH} in