Skip to content

Commit

Permalink
Update SWIFT_VERSION to 5.9.2
Browse files Browse the repository at this point in the history
  • Loading branch information
xtremekforever committed Jan 12, 2025
1 parent c87d5b9 commit b53fc25
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-swift-latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,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.9.2"
SWIFT_TAG: swift-5.9.2-RELEASE
name: Build Swift
runs-on: ubuntu-latest
steps:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-swift-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ name: Build Swift Release

on:
push:
branches: [ "release/6.0.3" ]
branches: [ "release/5.9.2" ]

env:
SWIFT_VERSION: "6.0.3"
SWIFT_TAG: swift-6.0.3-RELEASE
SWIFT_VERSION: "5.9.2"
SWIFT_TAG: swift-5.9.2-RELEASE
SWIFT_WORKSPACE_CACHE: swift-workspace

jobs:
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.9.2-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.9.2-RELEASE ubuntu-noble
```

## Continuous Integration & Releases
Expand All @@ -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.9.2-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.9.2-RELEASE-debian-bookworm-armv7/debian-bookworm.json
```
2 changes: 1 addition & 1 deletion swift-builder/build-gh-runner.sh
Original file line number Diff line number Diff line change
@@ -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.9.2) to this script!"
exit -1
fi

Expand Down
2 changes: 1 addition & 1 deletion swift-builder/swift-builder-common
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
SWIFT_VERSION=${SWIFT_VERSION:=6.0.3}
SWIFT_VERSION=${SWIFT_VERSION:=5.9.2}
SWIFT_BRANCH=${SWIFT_BRANCH:=swift-${SWIFT_VERSION}-release}
SWIFT_TAG=${SWIFT_TAG:=swift-${SWIFT_VERSION}-RELEASE}

Expand Down
2 changes: 1 addition & 1 deletion swift-define
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Version
SWIFT_VERSION=${SWIFT_VERSION:=swift-6.0.3-RELEASE}
SWIFT_VERSION=${SWIFT_VERSION:=swift-5.9.2-RELEASE}
SWIFT_TARGET_ARCH=${SWIFT_TARGET_ARCH:=armv7}

case ${SWIFT_TARGET_ARCH} in
Expand Down

0 comments on commit b53fc25

Please sign in to comment.