diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 85107a857a..1795364356 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,8 +1,5 @@ name: Release on: - release: - types: - - published workflow_dispatch: inputs: tag: @@ -12,7 +9,7 @@ on: jobs: build-release: name: Build binary - runs-on: self-hosted + runs-on: ubuntu-latest steps: - name: Set tag from input run: | @@ -27,6 +24,15 @@ jobs: - name: Check to latest commit uses: actions/checkout@v2 + - name: Install toolchain + uses: actions-rs/toolchain@v1 + with: + profile: minimal + toolchain: nightly-2021-11-07 + components: rustfmt + target: wasm32-unknown-unknown + default: true + - name: Build bifrost run: | .maintain/publish-release.sh @@ -36,7 +42,6 @@ jobs: with: name: bifrost-artifact-${{ github.sha }} path: | - ./resources/bifrost-wasm.tar.bz2 ./resources/bifrost-x86_64-linux-gnu.tar.bz2 - uses: 8398a7/action-slack@v3 diff --git a/.github/workflows/srtool.yml b/.github/workflows/srtool.yml index f9c9c8fd3f..b7f42c0a03 100644 --- a/.github/workflows/srtool.yml +++ b/.github/workflows/srtool.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: chain: ["bifrost"] - runs-on: self-hosted + runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 with: @@ -70,7 +70,7 @@ jobs: subwasm --json meta ${{ steps.srtool_build.outputs.wasm }} > ${{ matrix.chain }}-metadata.json - name: Check the metadata diff run: | - subwasm get wss://bifrost-rpc.liebi.com/ws --output runtime_mainnet.wasm + subwasm get wss://bifrost-rpc.liebi.com:443/ws --output runtime_mainnet.wasm subwasm diff ${{ steps.srtool_build.outputs.wasm }} runtime_mainnet.wasm | tee ${{ matrix.chain }}-diff.txt - name: Archive Subwasm results uses: actions/upload-artifact@v2 diff --git a/.maintain/publish-release.sh b/.maintain/publish-release.sh index 47d6fdd2e0..d172b897bb 100755 --- a/.maintain/publish-release.sh +++ b/.maintain/publish-release.sh @@ -2,7 +2,7 @@ set -xe -RUSTC_VERSION="1.53.0" +RUSTC_VERSION="1.56.1" EXTRA_ARGS='--json' RUNTIME=bifrost BIN_PATH=$(dirname $(readlink -f $0)) @@ -14,17 +14,3 @@ make build-bifrost-release cp target/release/bifrost ${WORK_PATH}/resources chmod +x ${WORK_PATH}/resources/bifrost tar cjSf ${WORK_PATH}/resources/bifrost-x86_64-linux-gnu.tar.bz2 ${WORK_PATH}/resources/bifrost - - -###### build wasm -docker run --rm -it \ - -e PACKAGE=$RUNTIME-runtime \ - -e VERBOSE=1 \ - -e CARGO_TERM_COLOR=always \ - -v ${TMPDIR}/cargo:/cargo-home \ - -v ${WORK_PATH}:/build \ - paritytech/srtool:${RUSTC_VERSION} build ${EXTRA_ARGS} - -cp ${WORK_PATH}/runtime/$RUNTIME/target/srtool/release/wbuild/$RUNTIME-runtime/${RUNTIME}_runtime.compact.wasm \ -${WORK_PATH}/resources -tar cjSf ${WORK_PATH}/resources/bifrost-wasm.tar.bz2 ${WORK_PATH}/resources/${RUNTIME}_runtime.compact.wasm \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 11e1232a3e..f61f04f4c4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ FROM rust:buster as builder RUN apt-get update && apt-get install time clang libclang-dev llvm -y -RUN rustup toolchain install nightly-2021-09-12 +RUN rustup toolchain install nightly-2021-11-07 RUN rustup target add wasm32-unknown-unknown --toolchain nightly-2021-09-12 WORKDIR /app diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 0000000000..57f8f34245 --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,5 @@ +[toolchain] +channel = "nightly-2021-11-07" +components = ["cargo", "clippy", "rustc", "rustfmt", "rust-src"] +profile = "minimal" +targets = ["wasm32-unknown-unknown"] \ No newline at end of file