diff --git a/.github/pull.yml b/.github/pull.yml index 32762ab446c0d..3ff8eb467b088 100644 --- a/.github/pull.yml +++ b/.github/pull.yml @@ -1,6 +1,9 @@ version: "1" rules: - base: swiftwasm - upstream: apple:master + upstream: master mergeMethod: merge + - base: master + upstream: apple:master + mergeMethod: hardreset label: ":arrow_heading_down: Upstream Tracking" diff --git a/utils/webassembly/ci-linux.sh b/utils/webassembly/ci-linux.sh index 9a00e5d4cc821..8d3b5b18316d9 100755 --- a/utils/webassembly/ci-linux.sh +++ b/utils/webassembly/ci-linux.sh @@ -34,8 +34,8 @@ sudo ./install_cmake.sh --skip-license --prefix=/opt/cmake sudo ln -sf /opt/cmake/bin/* /usr/local/bin cmake --version -wget -O dist-wasi-sdk.tgz https://github.com/swiftwasm/wasi-sdk/suites/370986556/artifacts/809002 -unzip dist-wasi-sdk.tgz -d . +wget -O dist-wasi-sdk.tgz.zip "https://github.com/swiftwasm/wasi-sdk/releases/download/0.1.0-swiftwasm/dist-ubuntu-latest.tgz.zip" +unzip dist-wasi-sdk.tgz.zip -d . WASI_SDK_TAR_PATH=$(find . -type f -name "wasi-sdk-*") WASI_SDK_FULL_NAME=$(basename $WASI_SDK_TAR_PATH -linux.tar.gz) tar xfz $WASI_SDK_TAR_PATH diff --git a/utils/webassembly/ci-mac.sh b/utils/webassembly/ci-mac.sh index e2c6e3bb49589..e3e898366f1b7 100755 --- a/utils/webassembly/ci-mac.sh +++ b/utils/webassembly/ci-mac.sh @@ -23,8 +23,8 @@ sudo ln -sf /opt/wasmtime/* /usr/local/bin cd $SOURCE_PATH -wget -O dist-wasi-sdk.tgz https://github.com/swiftwasm/wasi-sdk/suites/370986556/artifacts/809001 -unzip dist-wasi-sdk.tgz -d . +wget -O dist-wasi-sdk.tgz.zip "https://github.com/swiftwasm/wasi-sdk/releases/download/0.1.0-swiftwasm/dist-macos-latest.tgz.zip" +unzip dist-wasi-sdk.tgz.zip -d . WASI_SDK_TAR_PATH=$(find . -type f -name "wasi-sdk-*") WASI_SDK_FULL_NAME=$(basename $WASI_SDK_TAR_PATH -macos.tar.gz) tar xfz $WASI_SDK_TAR_PATH