From 23bf7c0d1f203722cba7c7dd87bff6f669722964 Mon Sep 17 00:00:00 2001 From: MrPai <1164934857@qq.com> Date: Wed, 21 Sep 2022 09:33:10 +0000 Subject: [PATCH] clean up --- .github/workflows/srtool.yml | 6 +----- Dockerfile.srtool | 10 --------- scripts/build-runtime-srtool.sh | 36 --------------------------------- 3 files changed, 1 insertion(+), 51 deletions(-) delete mode 100644 Dockerfile.srtool delete mode 100644 scripts/build-runtime-srtool.sh diff --git a/.github/workflows/srtool.yml b/.github/workflows/srtool.yml index 7e5e923ac..adccaa657 100644 --- a/.github/workflows/srtool.yml +++ b/.github/workflows/srtool.yml @@ -3,7 +3,7 @@ name: Srtool build on: push: branches: - - BTE-889-fix-parallel-ci-srtool-error + - master tags: - "v*" @@ -45,10 +45,6 @@ jobs: strategy: matrix: chain: ["heiko", "parallel", "vanilla", "kerria"] - srtool_image: - - parallelfinance/srtool - srtool_image_tag: - - 1.62.0 steps: - name: cleaning up run: | diff --git a/Dockerfile.srtool b/Dockerfile.srtool deleted file mode 100644 index 7f72c9942..000000000 --- a/Dockerfile.srtool +++ /dev/null @@ -1,10 +0,0 @@ -ARG SRTOOL_IMAGE_TAG - -FROM paritytech/srtool:${SRTOOL_IMAGE_TAG} - -USER root - -RUN apt-get update && \ - apt-get install openssh-server -y - -USER 1001 \ No newline at end of file diff --git a/scripts/build-runtime-srtool.sh b/scripts/build-runtime-srtool.sh deleted file mode 100644 index 34264a83f..000000000 --- a/scripts/build-runtime-srtool.sh +++ /dev/null @@ -1,36 +0,0 @@ -# Docker command to generate JSON blob of the runtime -CMD="docker run \ - -i \ - --rm \ - -e CARGO_NET_GIT_FETCH_WITH_CLI=true \ - -e PACKAGE=parallel-runtime \ - -e RUNTIME_DIR=runtime/parallel \ - -v ${PWD}:/build \ - -v /home/${USER}/srtool/.ssh:/home/builder/.ssh \ - -v /home/${USER}/srtool/entrypoint.sh:/srtool/entrypoint.sh \ - --entrypoint /srtool/entrypoint.sh \ - parallelfinance/srtool:1.62.0 \ - build --app --json -cM" - -# Here we run the command and stream the output (JSON blob) to a variable -stdbuf -oL $CMD | { - while IFS= read -r line - do - echo ║ $line - JSON="$line" - done - - echo ::set-output name=json::$JSON - - PROP=`echo $JSON | jq -r .runtimes.compact.prop` - echo ::set-output name=proposal_hash::$PROP - - WASM=`echo $JSON | jq -r .runtimes.compact.wasm` - echo ::set-output name=wasm::$WASM - - Z_WASM=`echo $JSON | jq -r .runtimes.compressed.wasm` - echo ::set-output name=wasm_compressed::$Z_WASM - - IPFS=`echo $JSON | jq -r .runtimes.compact.ipfs` - echo ::set-output name=ipfs::$IPFS -} \ No newline at end of file