From 3962df5a64e7e5bfdd6dee7793e49125d2e8b8ef Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Wed, 20 May 2020 00:26:52 +0300 Subject: [PATCH 1/2] travis: add job to build runtime wasm blob deterministicly with docker --- .travis.yml | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index df132cdefc..3aac763f2c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,9 @@ matrix: services: docker - os: osx env: TARGET=x86_64-apple-darwin + - os: linux + env: TARGET=wasm-blob + services: docker before_install: - rustup component add rustfmt @@ -39,27 +42,41 @@ script: joystream/rust-raspberry \ build --release sudo chmod a+r ${TRAVIS_BUILD_DIR}/target/${TARGET}/release/joystream-node + else if [ "$TARGET" = "wasm-blob" ] + then + docker build --tag joystream/node \ + --file ./devops/dockerfiles/node-and-runtime/Dockerfile \ + . + docker create --name temp-container-joystream-node joystream/node + docker cp temp-container-joystream-node:/joystream/runtime.compact.wasm joystream_runtime.wasm + docker rm temp-container-joystream-node else cargo build --release --target=${TARGET} fi before_deploy: - - cp ./target/${TARGET}/release/joystream-node . - | - if [ "$TARGET" = "arm-unknown-linux-gnueabihf" ] + if [ "$TARGET" = "wasm-blob" ] then - export FILENAME="joystream-node-armv7-linux-gnueabihf" + export ASSET="joystream_runtime.wasm" else - export FILENAME=`./joystream-node --version | sed -e "s/ /-/g"` + cp ./target/${TARGET}/release/joystream-node . + if [ "$TARGET" = "arm-unknown-linux-gnueabihf" ] + then + export FILENAME="joystream-node-armv7-linux-gnueabihf" + else + export FILENAME=`./joystream-node --version | sed -e "s/ /-/g"` + fi + tar -cf ${FILENAME}.tar ./joystream-node + gzip ${FILENAME}.tar + export ASSET=${FILENAME}.tar.gz fi - - tar -cf ${FILENAME}.tar ./joystream-node - - gzip ${FILENAME}.tar deploy: - provider: releases api_key: secure: FfxZGQexxAGT0Skbctl1FuqmEvNHejPDPtNG8Du1ACSGjS7Y+M6o/aPqE6HL158AmddOgndsIPR+HM7VfMDAUMkLTbOhv3nMpDBZu1h25vwk+jHOM65tm5LWUu/ROWBpaAQiG7NKrvtfkNfbNBSETsEbWBt/DPrhlIfSbgsXBFDiid7uRrCiwvDUJ097/EUOJ9OVUrk+O4ebSzfIfKPGPtRU2rQQ0eNX7yX3TCm3jbQm/kplkQNRL9mnAJNxtKuvuko4LqZ6jN4XLoLTHUMjO7E0r6wXVB4GVjA4HA214eLlQD6BhgTbWMDxKgWyuKzPG+2GLKyluSSn0RurSl8tYryXKxKxuN3H1FX9r23a8AzGtpRACJtIePC2YmPuQRSnz2Bw8jlSP2WPLJtXGD036J/wVMj6W9TROm7IBigiC7QlqAqCYNByOnoKyhRCgYyAJZb0Jpa3qWaFhA6b6gCGhyH85QCcrc0q6JAB3oqH8Wfm/K2HVzBobmKaSFu5DpwInNnUXnLWGVzhSt3oCq6ld773izReGdLJtLC2vaJ9rZVaVw29s9M662EEuAGgaVLO/sinZJFeIIaCF4i4zUXwXSLIdfKXGOR0ZibkyT2FS6qPGvl/lLN5IREzD7v/rV8htGMLmw4jpPLNskvRjCHX42ewRRYdMvZzQQOAvSlWcsw= - file: ${FILENAME}.tar.gz + file: ${ASSET} on: tags: true repo: Joystream/joystream @@ -69,7 +86,7 @@ deploy: - provider: releases api_key: secure: FfxZGQexxAGT0Skbctl1FuqmEvNHejPDPtNG8Du1ACSGjS7Y+M6o/aPqE6HL158AmddOgndsIPR+HM7VfMDAUMkLTbOhv3nMpDBZu1h25vwk+jHOM65tm5LWUu/ROWBpaAQiG7NKrvtfkNfbNBSETsEbWBt/DPrhlIfSbgsXBFDiid7uRrCiwvDUJ097/EUOJ9OVUrk+O4ebSzfIfKPGPtRU2rQQ0eNX7yX3TCm3jbQm/kplkQNRL9mnAJNxtKuvuko4LqZ6jN4XLoLTHUMjO7E0r6wXVB4GVjA4HA214eLlQD6BhgTbWMDxKgWyuKzPG+2GLKyluSSn0RurSl8tYryXKxKxuN3H1FX9r23a8AzGtpRACJtIePC2YmPuQRSnz2Bw8jlSP2WPLJtXGD036J/wVMj6W9TROm7IBigiC7QlqAqCYNByOnoKyhRCgYyAJZb0Jpa3qWaFhA6b6gCGhyH85QCcrc0q6JAB3oqH8Wfm/K2HVzBobmKaSFu5DpwInNnUXnLWGVzhSt3oCq6ld773izReGdLJtLC2vaJ9rZVaVw29s9M662EEuAGgaVLO/sinZJFeIIaCF4i4zUXwXSLIdfKXGOR0ZibkyT2FS6qPGvl/lLN5IREzD7v/rV8htGMLmw4jpPLNskvRjCHX42ewRRYdMvZzQQOAvSlWcsw= - file: ${FILENAME}.tar.gz + file: ${ASSET} on: branch: development repo: Joystream/joystream From 9aeaa5ab83d69d386dfe274debaeb45a39a05b0d Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Wed, 20 May 2020 01:41:45 +0300 Subject: [PATCH 2/2] travis: fix elif syntax --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3aac763f2c..bfaefebec6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,7 +42,7 @@ script: joystream/rust-raspberry \ build --release sudo chmod a+r ${TRAVIS_BUILD_DIR}/target/${TARGET}/release/joystream-node - else if [ "$TARGET" = "wasm-blob" ] + elif [ "$TARGET" = "wasm-blob" ] then docker build --tag joystream/node \ --file ./devops/dockerfiles/node-and-runtime/Dockerfile \