From c61bf6f5a28914b24a12c5dd42c3c3528c17c974 Mon Sep 17 00:00:00 2001 From: haroldsphinx Date: Fri, 4 Feb 2022 18:49:02 +0100 Subject: [PATCH 01/11] Update simnode script --- .maintain/run_simnode.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.maintain/run_simnode.sh b/.maintain/run_simnode.sh index f92aeabba1c..e23293618f2 100755 --- a/.maintain/run_simnode.sh +++ b/.maintain/run_simnode.sh @@ -18,7 +18,7 @@ VERSIONS_FILES=( /home/runner/.cargo/bin/rustup target add wasm32-unknown-unknown --toolchain nightly /home/runner/.cargo/bin/cargo build --release -p simnode sudo chown -R runner:runner target/release/simnode && sudo chmod +x target/release/simnode -sudo chown -R runner:runner /tmp/db +sudo mkkdir -p /tmp/db && sudo chown -R runner:runner /tmp/db YDATE=$(date -d yesterday +'%m-%d-%Y') run_simnode() { From 3e4e0f4a224c36bc7b60089dd155d66a65796558 Mon Sep 17 00:00:00 2001 From: haroldsphinx Date: Sat, 5 Feb 2022 11:09:48 +0100 Subject: [PATCH 02/11] Update simonde script --- .github/workflows/release-pipeline.yml | 5 +++++ .maintain/run_simnode.sh | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-pipeline.yml b/.github/workflows/release-pipeline.yml index 0880763e3d3..e803295a45d 100644 --- a/.github/workflows/release-pipeline.yml +++ b/.github/workflows/release-pipeline.yml @@ -32,6 +32,11 @@ jobs: cargo install --git https://github.com/chevdor/srtool-cli cargo install --locked --git https://github.com/chevdor/subwasm --tag v0.16.1 + - name: Set env + run: | + echo "RELEASE_VERSION=$(git tag --sort=committerdate | grep -E '^v[0-9]' | tail -1 )" >> $GITHUB_ENV + make version + - name: Runtime wasm builds id: runtime_release env: diff --git a/.maintain/run_simnode.sh b/.maintain/run_simnode.sh index a26fbf5a037..9aecc18c9d2 100755 --- a/.maintain/run_simnode.sh +++ b/.maintain/run_simnode.sh @@ -28,7 +28,7 @@ run_simnode() { GS_BUCKET="$CHAIN-data-store" sudo gsutil cp gs://$GS_BUCKET/"$FILENAME" . sudo unzip -o "$FILENAME" -d /tmp/db - ./target/release/simnode --chain="$CHAIN" --base-path=/tmp/db/ --pruning=archive --execution=wasm + ./target/release/simnode --chain="$CHAIN" --base-path=/tmp/db/var/lib/composable-data/ --pruning=archive --execution=wasm } # shellcheck disable=SC2039 From d6b9bafe77b97b9769b7c7e536b3a152969e372f Mon Sep 17 00:00:00 2001 From: haroldsphinx Date: Sat, 5 Feb 2022 12:27:43 +0100 Subject: [PATCH 03/11] github action to upload benchmark commit --- .github/workflows/benchmark.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index dc9787e3701..3ee3686b1f3 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -37,14 +37,12 @@ jobs: id: branch-name uses: tj-actions/branch-names@v5.1 - # - name: Check for runtime changes - # env: - # BASE_BRANCH: ${{ github.event.pull_request.base.ref }} - # GITHUB_BRANCH_NAME: ${{ steps.branch-name.outputs.current_branch }} - - # id: check_runtime - # if: contains( github.event.pull_request.labels.*.name, 'needs-benchmarks') - # run: .maintain/check_runtime.sh + - uses: EndBug/add-and-commit@v8 + with: + add: 'runtime/picasso' + message: 'Pushing benchmark changes' + push: "true" + - name: Benchmark Test env: From a683dd1da9c14e8c01418daefd70575a72070bdf Mon Sep 17 00:00:00 2001 From: haroldsphinx Date: Sat, 5 Feb 2022 12:30:01 +0100 Subject: [PATCH 04/11] github action to upload benchmark commit --- .github/workflows/benchmark.yml | 16 ++++++++-------- Makefile | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 3ee3686b1f3..40f2b725810 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -44,11 +44,11 @@ jobs: push: "true" - - name: Benchmark Test - env: - BASE_BRANCH: ${{ github.event.pull_request.base.ref }} - GITHUB_BRANCH_NAME: ${{ steps.branch-name.outputs.current_branch }} - - if: env.RUNTIME_CHECK == 1 - id: run_benchmarks - run: .maintain/run_benchmarks.sh + # - name: Benchmark Test + # env: + # BASE_BRANCH: ${{ github.event.pull_request.base.ref }} + # GITHUB_BRANCH_NAME: ${{ steps.branch-name.outputs.current_branch }} + + # if: env.RUNTIME_CHECK == 1 + # id: run_benchmarks + # run: .maintain/run_benchmarks.sh diff --git a/Makefile b/Makefile index d05b7dda3de..e6c8082f3a0 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ REPO=composablefi SERVICE_NAME=composable INSTALL_DIR=docker/ IMAGE_URL:=${REPO}/${SERVICE_NAME} -RELEASE_VERSION:=$(shell git tag --sort=committerdate | grep -E '^[0-9]' | tail -1) +RELEASE_VERSION:=$(shell git tag --sort=committerdate | grep -E '^v[0-9]' | tail -1) CARGO_VERSION:=$(sed -i '' "s|^version =.*|version = "${VERSION}"|" node/Cargo.toml) AUTO_UPDATE:=1 From c1e340ca0363fb167e037d45cef8eefd4b61bdca Mon Sep 17 00:00:00 2001 From: haroldsphinx Date: Sat, 5 Feb 2022 12:38:24 +0100 Subject: [PATCH 05/11] github action to upload benchmark commit --- .github/workflows/benchmark.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 40f2b725810..2c2f6680fd6 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -37,18 +37,18 @@ jobs: id: branch-name uses: tj-actions/branch-names@v5.1 + - name: Benchmark Test + env: + BASE_BRANCH: ${{ github.event.pull_request.base.ref }} + GITHUB_BRANCH_NAME: ${{ steps.branch-name.outputs.current_branch }} + + if: env.RUNTIME_CHECK == 1 + id: run_benchmarks + run: .maintain/run_benchmarks.sh + - uses: EndBug/add-and-commit@v8 with: add: 'runtime/picasso' message: 'Pushing benchmark changes' push: "true" - - # - name: Benchmark Test - # env: - # BASE_BRANCH: ${{ github.event.pull_request.base.ref }} - # GITHUB_BRANCH_NAME: ${{ steps.branch-name.outputs.current_branch }} - - # if: env.RUNTIME_CHECK == 1 - # id: run_benchmarks - # run: .maintain/run_benchmarks.sh From e79ce892b9bf38c991125d27a6e4ba349f820a5e Mon Sep 17 00:00:00 2001 From: haroldsphinx Date: Sat, 5 Feb 2022 12:54:56 +0100 Subject: [PATCH 06/11] github action to upload benchmark commit --- .github/workflows/benchmark.yml | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 2c2f6680fd6..e43a8baadae 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -37,14 +37,17 @@ jobs: id: branch-name uses: tj-actions/branch-names@v5.1 - - name: Benchmark Test + - name: Check for runtime changes env: BASE_BRANCH: ${{ github.event.pull_request.base.ref }} GITHUB_BRANCH_NAME: ${{ steps.branch-name.outputs.current_branch }} - if: env.RUNTIME_CHECK == 1 - id: run_benchmarks - run: .maintain/run_benchmarks.sh + id: check_runtime + if: contains( github.event.pull_request.labels.*.name, 'needs-benchmarks') + run: .maintain/check_runtime.sh + + - name: Test commit changes + runs: echo "RUntime update" >> runtime/picasso/runtime.txt - uses: EndBug/add-and-commit@v8 with: @@ -52,3 +55,12 @@ jobs: message: 'Pushing benchmark changes' push: "true" + + - name: Benchmark Test + env: + BASE_BRANCH: ${{ github.event.pull_request.base.ref }} + GITHUB_BRANCH_NAME: ${{ steps.branch-name.outputs.current_branch }} + + if: env.RUNTIME_CHECK == 1 + id: run_benchmarks + run: .maintain/run_benchmarks.sh From edf5c70487f5731de66c9371b3e27d9714180033 Mon Sep 17 00:00:00 2001 From: haroldsphinx Date: Sat, 5 Feb 2022 12:55:45 +0100 Subject: [PATCH 07/11] github action to upload benchmark commit --- .github/workflows/benchmark.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index e43a8baadae..88b26c6ee00 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -47,7 +47,7 @@ jobs: run: .maintain/check_runtime.sh - name: Test commit changes - runs: echo "RUntime update" >> runtime/picasso/runtime.txt + run: echo "RUntime update" >> runtime/picasso/runtime.txt - uses: EndBug/add-and-commit@v8 with: From b24522ac50a3a32475b9543f07fa1a494094b8fe Mon Sep 17 00:00:00 2001 From: haroldsphinx Date: Sat, 5 Feb 2022 13:12:12 +0100 Subject: [PATCH 08/11] github action to upload benchmark commit --- .github/workflows/benchmark.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 88b26c6ee00..626d0787e32 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -47,13 +47,15 @@ jobs: run: .maintain/check_runtime.sh - name: Test commit changes - run: echo "RUntime update" >> runtime/picasso/runtime.txt + run: | + echo "RUntime update" >> runtime/picasso/runtime.txt - uses: EndBug/add-and-commit@v8 with: add: 'runtime/picasso' message: 'Pushing benchmark changes' push: "true" + new_branch: ${{ steps.branch-name.outputs.current_branch }} - name: Benchmark Test From 97c383e8b8e8df5864ae1953ba9ec4b771b89e51 Mon Sep 17 00:00:00 2001 From: haroldsphinx Date: Sat, 5 Feb 2022 12:13:07 +0000 Subject: [PATCH 09/11] Pushing benchmark changes --- runtime/picasso/runtime.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 runtime/picasso/runtime.txt diff --git a/runtime/picasso/runtime.txt b/runtime/picasso/runtime.txt new file mode 100644 index 00000000000..670f4ec708d --- /dev/null +++ b/runtime/picasso/runtime.txt @@ -0,0 +1 @@ +RUntime update From aed65dc0fe2389734530d1ea0509f149cb91f06e Mon Sep 17 00:00:00 2001 From: haroldsphinx Date: Sat, 5 Feb 2022 13:18:22 +0100 Subject: [PATCH 10/11] github action to upload benchmark commit --- .github/workflows/benchmark.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 626d0787e32..35edc270bc4 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -46,10 +46,6 @@ jobs: if: contains( github.event.pull_request.labels.*.name, 'needs-benchmarks') run: .maintain/check_runtime.sh - - name: Test commit changes - run: | - echo "RUntime update" >> runtime/picasso/runtime.txt - - uses: EndBug/add-and-commit@v8 with: add: 'runtime/picasso' From 0d73a3720fb044e3e866a89c7f90e46c345d422b Mon Sep 17 00:00:00 2001 From: haroldsphinx Date: Sat, 5 Feb 2022 13:18:55 +0100 Subject: [PATCH 11/11] github action to upload benchmark commit --- runtime/picasso/runtime.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 runtime/picasso/runtime.txt diff --git a/runtime/picasso/runtime.txt b/runtime/picasso/runtime.txt deleted file mode 100644 index 670f4ec708d..00000000000 --- a/runtime/picasso/runtime.txt +++ /dev/null @@ -1 +0,0 @@ -RUntime update