Skip to content

Commit 5529fd7

Browse files
Update upstream tracking strategy via own master branch (#36)
* Update upstream tracking strategy via own master branch Changed to create merge PR from it's own master branch which is automatically synced with apple:master. Creating merge PR from apple:master sends CI failure email to apple members, so we need to change tracking strategy. New Tracking steps: 1. sync master branch from apple:master apple:master -> swiftwasm:master 2. create merge PR from swiftwasm:master swiftwasm:master -> swiftwasm:swiftwasm * Use released artifact instead of Actions artifacts directly
1 parent 480d476 commit 5529fd7

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

.github/pull.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
version: "1"
22
rules:
33
- base: swiftwasm
4-
upstream: apple:master
4+
upstream: master
55
mergeMethod: merge
6+
- base: master
7+
upstream: apple:master
8+
mergeMethod: hardreset
69
label: ":arrow_heading_down: Upstream Tracking"

utils/webassembly/ci-linux.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ sudo ./install_cmake.sh --skip-license --prefix=/opt/cmake
3434
sudo ln -sf /opt/cmake/bin/* /usr/local/bin
3535
cmake --version
3636

37-
wget -O dist-wasi-sdk.tgz https://github.com/swiftwasm/wasi-sdk/suites/370986556/artifacts/809002
38-
unzip dist-wasi-sdk.tgz -d .
37+
wget -O dist-wasi-sdk.tgz.zip "https://github.com/swiftwasm/wasi-sdk/releases/download/0.1.0-swiftwasm/dist-ubuntu-latest.tgz.zip"
38+
unzip dist-wasi-sdk.tgz.zip -d .
3939
WASI_SDK_TAR_PATH=$(find . -type f -name "wasi-sdk-*")
4040
WASI_SDK_FULL_NAME=$(basename $WASI_SDK_TAR_PATH -linux.tar.gz)
4141
tar xfz $WASI_SDK_TAR_PATH

utils/webassembly/ci-mac.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ sudo ln -sf /opt/wasmtime/* /usr/local/bin
2323

2424
cd $SOURCE_PATH
2525

26-
wget -O dist-wasi-sdk.tgz https://github.com/swiftwasm/wasi-sdk/suites/370986556/artifacts/809001
27-
unzip dist-wasi-sdk.tgz -d .
26+
wget -O dist-wasi-sdk.tgz.zip "https://github.com/swiftwasm/wasi-sdk/releases/download/0.1.0-swiftwasm/dist-macos-latest.tgz.zip"
27+
unzip dist-wasi-sdk.tgz.zip -d .
2828
WASI_SDK_TAR_PATH=$(find . -type f -name "wasi-sdk-*")
2929
WASI_SDK_FULL_NAME=$(basename $WASI_SDK_TAR_PATH -macos.tar.gz)
3030
tar xfz $WASI_SDK_TAR_PATH

0 commit comments

Comments
 (0)