From 46528bf4024e24421ce894017f18f0c29b8aab52 Mon Sep 17 00:00:00 2001 From: gera Date: Thu, 26 Jan 2023 15:57:45 +0100 Subject: [PATCH 1/7] chore: init --- .gitlab-ci.yml | 4 ++++ .maintain/s3-upload.sh | 9 +++++++++ 2 files changed, 13 insertions(+) create mode 100755 .maintain/s3-upload.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f3cd90ee1..1ba025243 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -80,8 +80,10 @@ build-wasm-peregrine: - export RUNTIME_DIR=runtimes/peregrine - cp -r * /build - /srtool/build build + - subwasm spiritnet_runtime.compact.compressed.wasm > /tmp/spiritnet-metadata.json - mkdir ./out - mv /out/* ./out/ + - ./.maintain/s3-upload.sh peregrine ${CI_COMMIT_TAG} artifacts: paths: - out/*.wasm @@ -101,8 +103,10 @@ build-wasm-spiritnet: - export RUNTIME_DIR=runtimes/spiritnet - cp -r * /build - /srtool/build build + - subwasm spiritnet_runtime.compact.compressed.wasm > /tmp/spiritnet-metadata.json - mkdir ./out - mv /out/* ./out/ + - ./.maintain/s3-upload.sh spiritnet ${CI_COMMIT_TAG} artifacts: paths: - out/*.wasm diff --git a/.maintain/s3-upload.sh b/.maintain/s3-upload.sh new file mode 100755 index 000000000..044a11c33 --- /dev/null +++ b/.maintain/s3-upload.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +aws configure set region eu-central-1 + +if [[ "$1" == "spiritnet" ]]; then +aws s3 cp /tmp/spiritnet-metadata.json s3://$S3_BUCKET/spiritnet/$2/ +else +aws s3 cp /tmp/peregrine-metadata.json s3://$S3_BUCKET/peregrine/$2/ +fi From 5e31cfede93728eb5d6739b75d88a7d87e657655 Mon Sep 17 00:00:00 2001 From: gera Date: Thu, 26 Jan 2023 16:04:18 +0100 Subject: [PATCH 2/7] fix: rename --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1ba025243..15be69b50 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -80,7 +80,7 @@ build-wasm-peregrine: - export RUNTIME_DIR=runtimes/peregrine - cp -r * /build - /srtool/build build - - subwasm spiritnet_runtime.compact.compressed.wasm > /tmp/spiritnet-metadata.json + - subwasm --json meta peregrine_runtime.compact.compressed.wasm > /tmp/peregrine-metadata.json - mkdir ./out - mv /out/* ./out/ - ./.maintain/s3-upload.sh peregrine ${CI_COMMIT_TAG} @@ -103,7 +103,7 @@ build-wasm-spiritnet: - export RUNTIME_DIR=runtimes/spiritnet - cp -r * /build - /srtool/build build - - subwasm spiritnet_runtime.compact.compressed.wasm > /tmp/spiritnet-metadata.json + - subwasm --json meta spiritnet_runtime.compact.compressed.wasm > /tmp/spiritnet-metadata.json - mkdir ./out - mv /out/* ./out/ - ./.maintain/s3-upload.sh spiritnet ${CI_COMMIT_TAG} From 677159c8d160a44bf86f65b427a6eef52022e3b8 Mon Sep 17 00:00:00 2001 From: gera Date: Fri, 27 Jan 2023 11:47:06 +0100 Subject: [PATCH 3/7] chore: publish metadata as gitlab artifact --- .gitlab-ci.yml | 6 ++---- .maintain/s3-upload.sh | 9 --------- 2 files changed, 2 insertions(+), 13 deletions(-) delete mode 100755 .maintain/s3-upload.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 15be69b50..01a62300b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -80,10 +80,9 @@ build-wasm-peregrine: - export RUNTIME_DIR=runtimes/peregrine - cp -r * /build - /srtool/build build - - subwasm --json meta peregrine_runtime.compact.compressed.wasm > /tmp/peregrine-metadata.json + - subwasm --json meta /out/peregrine_runtime.compact.wasm > /out/peregrine-metadata.json - mkdir ./out - mv /out/* ./out/ - - ./.maintain/s3-upload.sh peregrine ${CI_COMMIT_TAG} artifacts: paths: - out/*.wasm @@ -103,10 +102,9 @@ build-wasm-spiritnet: - export RUNTIME_DIR=runtimes/spiritnet - cp -r * /build - /srtool/build build - - subwasm --json meta spiritnet_runtime.compact.compressed.wasm > /tmp/spiritnet-metadata.json + - subwasm --json meta /out/spiritnet_runtime.wasm > /out/spiritnet-metadata.json - mkdir ./out - mv /out/* ./out/ - - ./.maintain/s3-upload.sh spiritnet ${CI_COMMIT_TAG} artifacts: paths: - out/*.wasm diff --git a/.maintain/s3-upload.sh b/.maintain/s3-upload.sh deleted file mode 100755 index 044a11c33..000000000 --- a/.maintain/s3-upload.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -aws configure set region eu-central-1 - -if [[ "$1" == "spiritnet" ]]; then -aws s3 cp /tmp/spiritnet-metadata.json s3://$S3_BUCKET/spiritnet/$2/ -else -aws s3 cp /tmp/peregrine-metadata.json s3://$S3_BUCKET/peregrine/$2/ -fi From 76f365c12f6090c9d5ab1c4a0fa15ad4f9215aa6 Mon Sep 17 00:00:00 2001 From: gera Date: Fri, 27 Jan 2023 14:39:37 +0100 Subject: [PATCH 4/7] ci: add upload stage --- .gitlab-ci.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 01a62300b..5c96fa1e1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,7 @@ stages: - test - build + - upload clippy: # Corresponds to paritytech/ci-linux:production at the time of this PR @@ -109,3 +110,18 @@ build-wasm-spiritnet: paths: - out/*.wasm expire_in: 12 week + +upload: + stage: upload + dependencies: + - build-wasm-spiritnet + - build-wasm-peregrine + image: amazon/aws-cli:2.9.18 + script: + - aws configure set region $AWS_DEFAULT_REGION + - aws s3 cp /out/peregrine-metadata.json s3://$S3_BUCKET/peregrine/${CI_COMMIT_TAG}/ + - aws s3 cp /out/spiritnet-metadata.json s3://$S3_BUCKET/spiritnet/${CI_COMMIT_TAG}/ + only: + - master + - develop + From 64234b9c02b62425b394877752e20fb83a796827 Mon Sep 17 00:00:00 2001 From: Antonio Antonino Date: Thu, 9 Feb 2023 12:26:36 +0100 Subject: [PATCH 5/7] Update to new format --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ffba7ce31..4f22db922 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -83,7 +83,7 @@ build-wasm-peregrine: - export AUTHORIZE_UPGRADE_PREFIX=0x02 - cp -r * /build - /srtool/build build - - subwasm --json meta /out/peregrine_runtime.compact.wasm > /out/peregrine-metadata.json + - subwasm meta --format=json+scale /out/peregrine_runtime.compact.wasm > /out/peregrine-metadata.json - mkdir ./out - mv /out/* ./out/ artifacts: @@ -107,7 +107,7 @@ build-wasm-spiritnet: - export AUTHORIZE_UPGRADE_PREFIX=0x02 - cp -r * /build - /srtool/build build - - subwasm --json meta /out/spiritnet_runtime.wasm > /out/spiritnet-metadata.json + - subwasm meta --format=json+scale /out/spiritnet_runtime.wasm > /out/spiritnet-metadata.json - mkdir ./out - mv /out/* ./out/ artifacts: From 24dea3ca93f2cd75b80a9c51a2ff3a71451fbc5b Mon Sep 17 00:00:00 2001 From: gera Date: Thu, 27 Apr 2023 11:44:44 +0200 Subject: [PATCH 6/7] upgrade srtool --- .gitlab-ci.yml | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e1b426367..997f3fbf8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,6 @@ stages: - test - build - - upload clippy: # Corresponds to paritytech/ci-linux:production at the time of this PR @@ -66,7 +65,7 @@ build: build-wasm-peregrine: image: - name: paritytech/srtool:1.66.1-0.9.25 + name: paritytech/srtool:1.69.0 entrypoint: [""] stage: build only: @@ -90,7 +89,7 @@ build-wasm-peregrine: build-wasm-spiritnet: image: - name: paritytech/srtool:1.66.1-0.9.25 + name: paritytech/srtool:1.69.0 entrypoint: [""] stage: build only: @@ -111,18 +110,3 @@ build-wasm-spiritnet: paths: - out/*.wasm expire_in: 12 week - -upload: - stage: upload - dependencies: - - build-wasm-spiritnet - - build-wasm-peregrine - image: amazon/aws-cli:2.9.18 - script: - - aws configure set region $AWS_DEFAULT_REGION - - aws s3 cp /out/peregrine-metadata.json s3://$S3_BUCKET/peregrine/${CI_COMMIT_TAG}/ - - aws s3 cp /out/spiritnet-metadata.json s3://$S3_BUCKET/spiritnet/${CI_COMMIT_TAG}/ - only: - - master - - develop - From 0928537cc76852cf45500ba9c6ff98539c416207 Mon Sep 17 00:00:00 2001 From: gera Date: Tue, 2 May 2023 10:04:05 +0200 Subject: [PATCH 7/7] ci: add json artifacts path --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a7e66fe5d..5485b9fde 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -85,6 +85,7 @@ build-wasm-peregrine: artifacts: paths: - out/*.wasm + - out/*.json expire_in: 12 week build-wasm-spiritnet: @@ -109,4 +110,5 @@ build-wasm-spiritnet: artifacts: paths: - out/*.wasm + - out/*.json expire_in: 12 week