Skip to content

Commit de612ee

Browse files
[5.5] Update SwiftWasm build scripts for 5.5 release
1 parent df1b4a8 commit de612ee

File tree

7 files changed

+23
-3
lines changed

7 files changed

+23
-3
lines changed

.github/pull.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,11 @@ rules:
2121
upstream: release/5.4
2222
mergeMethod: merge
2323

24+
- base: release/5.5
25+
upstream: apple:release/5.5
26+
mergeMethod: hardreset
27+
- base: swiftwasm-release/5.5
28+
upstream: release/5.5
29+
mergeMethod: merge
30+
2431
label: ":arrow_heading_down: Upstream Tracking"

.github/workflows/build-toolchain.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@ on:
55
branches:
66
- swiftwasm
77
- swiftwasm-release/5.3
8+
- swiftwasm-release/5.5
89
pull_request:
910
branches:
1011
- swiftwasm
1112
- swiftwasm-release/5.3
13+
- swiftwasm-release/5.5
1214
jobs:
1315
build_toolchain:
1416
env:

.github/workflows/manual-distribution.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ jobs:
5252
"5.4")
5353
./utils/webassembly/distribute-latest-toolchain.sh ${BRANCH:-swiftwasm-release/5.4} 5.4 "${{ github.event.inputs.toolchain_name }}"
5454
;;
55+
"5.5")
56+
./utils/webassembly/distribute-latest-toolchain.sh ${BRANCH:-swiftwasm-release/5.5} 5.5 "${{ github.event.inputs.toolchain_name }}"
57+
;;
5558
*)
5659
echo "Unrecognised release channel: ${{ github.event.inputs.channel }}"
5760
exit 1

.github/workflows/nightly-distribution.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,3 +53,11 @@ jobs:
5353
DARWIN_TOOLCHAIN_INSTALLER_CERT: ${{ secrets.DARWIN_TOOLCHAIN_INSTALLER_CERT }}
5454
DARWIN_TOOLCHAIN_NOTARIZE_EMAIL: ${{ secrets.DARWIN_TOOLCHAIN_NOTARIZE_EMAIL }}
5555
DARWIN_TOOLCHAIN_NOTARIZE_PASSWORD: ${{ secrets.DARWIN_TOOLCHAIN_NOTARIZE_PASSWORD }}
56+
57+
- run: ./utils/webassembly/distribute-latest-toolchain.sh swiftwasm-release/5.5 5.5
58+
env:
59+
GITHUB_TOKEN: ${{ secrets.SWIFTWASM_BUILDBOT_TOKEN }}
60+
DARWIN_TOOLCHAIN_APPLICATION_CERT: ${{ secrets.DARWIN_TOOLCHAIN_APPLICATION_CERT }}
61+
DARWIN_TOOLCHAIN_INSTALLER_CERT: ${{ secrets.DARWIN_TOOLCHAIN_INSTALLER_CERT }}
62+
DARWIN_TOOLCHAIN_NOTARIZE_EMAIL: ${{ secrets.DARWIN_TOOLCHAIN_NOTARIZE_EMAIL }}
63+
DARWIN_TOOLCHAIN_NOTARIZE_PASSWORD: ${{ secrets.DARWIN_TOOLCHAIN_NOTARIZE_PASSWORD }}

utils/webassembly/build-toolchain.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ create_darwin_info_plist() {
151151
echo "-- Create Info.plist --"
152152
PLISTBUDDY_BIN="/usr/libexec/PlistBuddy"
153153

154-
DARWIN_TOOLCHAIN_VERSION="5.3.${YEAR}${MONTH}${DAY}"
154+
DARWIN_TOOLCHAIN_VERSION="5.5.${YEAR}${MONTH}${DAY}"
155155
BUNDLE_PREFIX="org.swiftwasm"
156156
DARWIN_TOOLCHAIN_BUNDLE_IDENTIFIER="${BUNDLE_PREFIX}.${YEAR}${MONTH}${DAY}"
157157
DARWIN_TOOLCHAIN_DISPLAY_NAME_SHORT="Swift for WebAssembly Snapshot"

utils/webassembly/linux/install-dependencies.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ SOURCE_PATH="$( cd "$(dirname $0)/../../../.." && pwd )"
3232
SWIFT_PATH=$SOURCE_PATH/swift
3333
cd $SWIFT_PATH
3434

35-
./utils/update-checkout --clone --scheme wasm --skip-repository swift
35+
./utils/update-checkout --clone --scheme wasm/5.5 --skip-repository swift
3636

3737
# Install wasmer
3838

utils/webassembly/macos/install-dependencies.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ SOURCE_PATH="$(cd "$(dirname $0)/../../../../" && pwd)"
1616
SWIFT_PATH=$SOURCE_PATH/swift
1717
cd $SWIFT_PATH
1818

19-
./utils/update-checkout --clone --scheme wasm --skip-repository swift
19+
./utils/update-checkout --clone --scheme wasm/5.5 --skip-repository swift
2020

2121
cd $SOURCE_PATH
2222

0 commit comments

Comments
 (0)