Skip to content

Commit da150e1

Browse files
committed
Update branches for 5.7 branch
1 parent 87628ea commit da150e1

File tree

6 files changed

+53
-2
lines changed

6 files changed

+53
-2
lines changed

.github/workflows/build-toolchain.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,15 @@ on:
88
- swiftwasm-release/5.4
99
- swiftwasm-release/5.5
1010
- swiftwasm-release/5.6
11+
- swiftwasm-release/5.7
1112
pull_request:
1213
branches:
1314
- swiftwasm
1415
- swiftwasm-release/5.3
1516
- swiftwasm-release/5.4
1617
- swiftwasm-release/5.5
1718
- swiftwasm-release/5.6
19+
- swiftwasm-release/5.7
1820
jobs:
1921
build_toolchain:
2022
env:

.github/workflows/manual-distribution.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@ jobs:
6363
export TARGETS_TO_DIST="amazonlinux2_x86_64 ubuntu18.04_x86_64 ubuntu20.04_x86_64 ubuntu20.04_aarch64 macos_x86_64 macos_arm64"
6464
./utils/webassembly/distribute-latest-toolchain.sh ${BRANCH:-swiftwasm-release/5.6} 5.6 "${{ github.event.inputs.toolchain_name }}"
6565
;;
66+
"5.7")
67+
export TARGETS_TO_DIST="amazonlinux2_x86_64 ubuntu18.04_x86_64 ubuntu20.04_x86_64 ubuntu20.04_aarch64 macos_x86_64 macos_arm64"
68+
./utils/webassembly/distribute-latest-toolchain.sh ${BRANCH:-swiftwasm-release/5.7} 5.7 "${{ github.event.inputs.toolchain_name }}"
69+
;;
6670
*)
6771
echo "Unrecognised release channel: ${{ github.event.inputs.channel }}"
6872
exit 1

.github/workflows/nightly-distribution.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ jobs:
2323
- branch: "swiftwasm-release/5.6"
2424
channel: "5.6"
2525
targets: "amazonlinux2_x86_64 ubuntu18.04_x86_64 ubuntu20.04_x86_64 ubuntu20.04_aarch64 macos_x86_64 macos_arm64"
26+
- branch: "swiftwasm-release/5.7"
27+
channel: "5.7"
28+
targets: "amazonlinux2_x86_64 ubuntu18.04_x86_64 ubuntu20.04_x86_64 ubuntu20.04_aarch64 macos_x86_64 macos_arm64"
2629
steps:
2730
- uses: actions/checkout@v1
2831
- name: Setup keychain

utils/update_checkout/update-checkout-config.json

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,48 @@
125125
"swift-experimental-string-processing": "swift/main"
126126
}
127127
},
128+
"swiftwasm-release/5.7": {
129+
"aliases": ["wasm/5.7", "swiftwasm/release/5.7", "swiftwasm-release/5.7"],
130+
"repos": {
131+
"llvm-project": "swift/release/5.7",
132+
"swift": "swiftwasm-release/5.7",
133+
"cmark": "release/5.7",
134+
"llbuild": "release/5.7",
135+
"swift-tools-support-core": "release/5.7",
136+
"swiftpm": "release/5.7",
137+
"swift-argument-parser": "1.0.3",
138+
"swift-atomics": "1.0.2",
139+
"swift-collections": "1.0.1",
140+
"swift-crypto": "1.1.5",
141+
"swift-driver": "release/5.7",
142+
"swift-numerics": "1.0.1",
143+
"swift-syntax": "release/5.7",
144+
"swift-system": "1.1.1",
145+
"swift-stress-tester": "release/5.7",
146+
"swift-corelibs-xctest": "swiftwasm-release/5.7",
147+
"swift-corelibs-foundation": "swiftwasm-release/5.7",
148+
"swift-corelibs-libdispatch": "release/5.7",
149+
"swift-integration-tests": "release/5.7",
150+
"swift-xcode-playground-support": "release/5.7",
151+
"ninja": "release",
152+
"icu": "release-65-1",
153+
"yams": "5.0.0",
154+
"cmake": "v3.19.6",
155+
"indexstore-db": "release/5.7",
156+
"sourcekit-lsp": "release/5.7",
157+
"swift-format": "release/5.7",
158+
"swift-installer-scripts": "release/5.7",
159+
"swift-docc": "release/5.7",
160+
"swift-lmdb": "release/5.7",
161+
"swift-docc-render-artifact": "release/5.7",
162+
"swift-docc-symbolkit": "release/5.7",
163+
"swift-markdown": "release/5.7",
164+
"swift-cmark-gfm": "release/5.7-gfm",
165+
"swift-nio": "2.31.2",
166+
"swift-nio-ssl": "2.15.0",
167+
"swift-experimental-string-processing": "swift/release/5.7"
168+
}
169+
},
128170
"main": {
129171
"aliases": ["swift/main", "main", "stable/20211026"],
130172
"repos": {

utils/webassembly/linux/install-dependencies.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ SOURCE_PATH="$( cd "$(dirname $0)/../../../.." && pwd )"
6868
SWIFT_PATH=$SOURCE_PATH/swift
6969
cd $SWIFT_PATH
7070

71-
./utils/update-checkout --clone --scheme wasm --skip-repository swift
71+
./utils/update-checkout --clone --scheme wasm/5.7 --skip-repository swift
7272

7373
# Install wasmer
7474
# FIXME: Wasmer doesn't support linux-aarch64, consider using a different WASI-compatible runtime.

utils/webassembly/macos/install-dependencies.sh

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

21-
./utils/update-checkout --clone --scheme wasm --skip-repository swift
21+
./utils/update-checkout --clone --scheme wasm/5.7 --skip-repository swift
2222

2323
cd $SOURCE_PATH
2424

0 commit comments

Comments
 (0)