Skip to content

Commit ec46630

Browse files
committed
Update build settings for swiftwasm-release/5.4
1 parent 5873934 commit ec46630

File tree

5 files changed

+38
-9
lines changed

5 files changed

+38
-9
lines changed

.github/workflows/main.yml

Lines changed: 5 additions & 3 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.4
89
pull_request:
910
branches:
1011
- swiftwasm
1112
- swiftwasm-release/5.3
13+
- swiftwasm-release/5.4
1214

1315
jobs:
1416
ubuntu1804_build:
@@ -49,7 +51,7 @@ jobs:
4951
uses: actions/upload-artifact@v1
5052
with:
5153
name: ubuntu18.04-installable
52-
path: ../swift-wasm-DEVELOPMENT-SNAPSHOT-ubuntu18.04_x86_64.tar.gz
54+
path: ../swift-wasm-5.4-SNAPSHOT-ubuntu18.04_x86_64.tar.gz
5355
# - name: Pack test results
5456
# run: tar cJf swift-test-results.tar.gz ../build/*/swift-linux-x86_64/swift-test-results
5557
# - name: Upload test results
@@ -95,7 +97,7 @@ jobs:
9597
uses: actions/upload-artifact@v1
9698
with:
9799
name: ubuntu20.04-installable
98-
path: ../swift-wasm-DEVELOPMENT-SNAPSHOT-ubuntu20.04_x86_64.tar.gz
100+
path: ../swift-wasm-5.4-SNAPSHOT-ubuntu20.04_x86_64.tar.gz
99101
# - name: Pack test results
100102
# run: tar cJf swift-test-results.tar.gz ../build/*/swift-linux-x86_64/swift-test-results
101103
# - name: Upload test results
@@ -135,7 +137,7 @@ jobs:
135137
uses: actions/upload-artifact@v1
136138
with:
137139
name: macos-installable
138-
path: ../swift-wasm-DEVELOPMENT-SNAPSHOT-macos_x86_64.tar.gz
140+
path: ../swift-wasm-5.4-SNAPSHOT-macos_x86_64.tar.gz
139141
- name: Pack test results
140142
working-directory: ${{ github.workspace }}/../
141143
run: |

utils/update_checkout/update-checkout-config.json

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,33 @@
104104
"swift-format": "master"
105105
}
106106
},
107+
"wasm/5.4": {
108+
"aliases": ["wasm/5.4", "swiftwasm-release/5.4"],
109+
"repos": {
110+
"llvm-project": "swiftwasm-release/5.4",
111+
"swift": "swiftwasm-release/5.4",
112+
"cmark": "release/5.4",
113+
"llbuild": "release/5.4",
114+
"swift-tools-support-core": "main",
115+
"swiftpm": "swiftwasm-release/5.4",
116+
"swift-argument-parser": "0.3.0",
117+
"swift-driver": "main",
118+
"swift-syntax": "release/5.4",
119+
"swift-stress-tester": "release/5.4",
120+
"swift-corelibs-xctest": "release/5.4",
121+
"swift-corelibs-foundation": "release/5.4",
122+
"swift-corelibs-libdispatch": "release/5.4",
123+
"swift-integration-tests": "release/5.4",
124+
"swift-xcode-playground-support": "release/5.4",
125+
"ninja": "release",
126+
"icu": "release-65-1",
127+
"yams": "3.0.1",
128+
"cmake": "v3.16.5",
129+
"indexstore-db": "main",
130+
"sourcekit-lsp": "main",
131+
"swift-format": "main"
132+
}
133+
},
107134
"main": {
108135
"aliases": ["master", "swift/main", "main"],
109136
"repos": {

utils/webassembly/build-toolchain.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ YEAR=$(date +"%Y")
3636
MONTH=$(date +"%m")
3737
DAY=$(date +"%d")
3838
TOOLCHAIN_VERSION="${YEAR}${MONTH}${DAY}"
39-
TOOLCHAIN_NAME="swift-wasm-DEVELOPMENT-SNAPSHOT-${YEAR}-${MONTH}-${DAY}-a"
39+
TOOLCHAIN_NAME="swift-wasm-5.4-SNAPSHOT-${YEAR}-${MONTH}-${DAY}-a"
4040

41-
PACKAGE_ARTIFACT="$SOURCE_PATH/swift-wasm-DEVELOPMENT-SNAPSHOT-${OS_SUFFIX}.tar.gz"
41+
PACKAGE_ARTIFACT="$SOURCE_PATH/swift-wasm-5.4-SNAPSHOT-${OS_SUFFIX}.tar.gz"
4242

43-
BUNDLE_IDENTIFIER="swiftwasm.${YEAR}${MONTH}${DAY}"
44-
DISPLAY_NAME_SHORT="Swift for WebAssembly Development Snapshot"
43+
BUNDLE_IDENTIFIER="swiftwasm.5.4-${YEAR}${MONTH}${DAY}"
44+
DISPLAY_NAME_SHORT="Swift for WebAssembly 5.4 Snapshot"
4545
DISPLAY_NAME="${DISPLAY_NAME_SHORT} ${YEAR}-${MONTH}-${DAY}"
4646

4747
DIST_TOOLCHAIN_DESTDIR=$SOURCE_PATH/dist-toolchain-sdk

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.4 --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
@@ -17,7 +17,7 @@ SOURCE_PATH="$(cd "$(dirname $0)/../../../../" && pwd)"
1717
SWIFT_PATH=$SOURCE_PATH/swift
1818
cd $SWIFT_PATH
1919

20-
./utils/update-checkout --clone --scheme wasm --skip-repository swift
20+
./utils/update-checkout --clone --scheme wasm/5.4 --skip-repository swift
2121

2222
cd $SOURCE_PATH
2323

0 commit comments

Comments
 (0)