From da970fa22088bb1e18deded2141c768224c617f3 Mon Sep 17 00:00:00 2001 From: yooml Date: Fri, 17 Dec 2021 11:20:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20add=20build-bifrost-?= =?UTF-8?q?wasm-jenkins=20for=20Makefile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .maintain/build-wasm-jenkins.sh | 22 ++++++++++++++++++++++ Makefile | 5 +++++ 2 files changed, 27 insertions(+) create mode 100755 .maintain/build-wasm-jenkins.sh diff --git a/.maintain/build-wasm-jenkins.sh b/.maintain/build-wasm-jenkins.sh new file mode 100755 index 0000000000..754a107b69 --- /dev/null +++ b/.maintain/build-wasm-jenkins.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env bash + +set -xe + +RUSTC_VERSION="1.56.1" +EXTRA_ARGS='--json' +BIN_PATH=$(dirname $(readlink -f $0)) +WORK_PATH=${BIN_PATH}/.. + +RUNTIME=$1 + +docker run --rm -i \ + -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} + +mkdir -p ${WORK_PATH}/deploy/wasm +cp ${WORK_PATH}/runtime/${RUNTIME/bifrost-kusama/bifrost}/target/srtool/release/wbuild/$RUNTIME-runtime/${RUNTIME/-/_}_runtime.compact.compressed.wasm \ +${WORK_PATH}/deploy/wasm \ No newline at end of file diff --git a/Makefile b/Makefile index 2e52267675..0670c548ba 100644 --- a/Makefile +++ b/Makefile @@ -148,6 +148,11 @@ build-bifrost-wasm: .maintain/build-wasm.sh bifrost-kusama .maintain/build-wasm.sh bifrost-polkadot +.PHONY: build-bifrost-wasm-jenkins +build-bifrost-wasm-jenkins: + .maintain/build-wasm-jenkins.sh bifrost-kusama + .maintain/build-wasm-jenkins.sh bifrost-polkadot + .PHONY: build-bifrost-kusama-wasm build-bifrost-kusama-wasm: .maintain/build-wasm.sh bifrost-kusama From a7eeadce3548d053f2061aa8e140b2e17dc547a7 Mon Sep 17 00:00:00 2001 From: yooml Date: Wed, 22 Dec 2021 14:54:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=F0=9F=90=9B=20fix=20build-wasm.sh?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .maintain/build-wasm-jenkins.sh | 22 ---------------------- .maintain/build-wasm.sh | 2 +- Makefile | 5 ----- 3 files changed, 1 insertion(+), 28 deletions(-) delete mode 100755 .maintain/build-wasm-jenkins.sh diff --git a/.maintain/build-wasm-jenkins.sh b/.maintain/build-wasm-jenkins.sh deleted file mode 100755 index 754a107b69..0000000000 --- a/.maintain/build-wasm-jenkins.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env bash - -set -xe - -RUSTC_VERSION="1.56.1" -EXTRA_ARGS='--json' -BIN_PATH=$(dirname $(readlink -f $0)) -WORK_PATH=${BIN_PATH}/.. - -RUNTIME=$1 - -docker run --rm -i \ - -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} - -mkdir -p ${WORK_PATH}/deploy/wasm -cp ${WORK_PATH}/runtime/${RUNTIME/bifrost-kusama/bifrost}/target/srtool/release/wbuild/$RUNTIME-runtime/${RUNTIME/-/_}_runtime.compact.compressed.wasm \ -${WORK_PATH}/deploy/wasm \ No newline at end of file diff --git a/.maintain/build-wasm.sh b/.maintain/build-wasm.sh index 66cff9da02..754a107b69 100755 --- a/.maintain/build-wasm.sh +++ b/.maintain/build-wasm.sh @@ -9,7 +9,7 @@ WORK_PATH=${BIN_PATH}/.. RUNTIME=$1 -docker run --rm -it \ +docker run --rm -i \ -e PACKAGE=$RUNTIME-runtime \ -e VERBOSE=1 \ -e CARGO_TERM_COLOR=always \ diff --git a/Makefile b/Makefile index 0670c548ba..2e52267675 100644 --- a/Makefile +++ b/Makefile @@ -148,11 +148,6 @@ build-bifrost-wasm: .maintain/build-wasm.sh bifrost-kusama .maintain/build-wasm.sh bifrost-polkadot -.PHONY: build-bifrost-wasm-jenkins -build-bifrost-wasm-jenkins: - .maintain/build-wasm-jenkins.sh bifrost-kusama - .maintain/build-wasm-jenkins.sh bifrost-polkadot - .PHONY: build-bifrost-kusama-wasm build-bifrost-kusama-wasm: .maintain/build-wasm.sh bifrost-kusama