git.delta.rocks / unique-network / refs/commits / d32fbd9e75f4

difftreelog

Merge pull request #1071 from UniqueNetwork/fix/ci-scripts

Yaroslav Bolyukin2024-06-07parents: #0d52e2c #f03ceef.patch.diff
in: master
fix path for scripts in workflows

3 files changed

modified.github/workflows/forkless-update-data.ymldiffbeforeafterboth
146146
147      - name: "Reconcile: runtime is upgraded"147      - name: "Reconcile: runtime is upgraded"
148        working-directory: js-packages/tests148        working-directory: js-packages/tests
149        run: |149        run: |
150          yarn150          yarn
151          ../scripts/wait_for_first_block.sh151          ../scripts/wait_for_first_block.sh
152          echo "Executing upgrade"152          echo "Executing upgrade"
153          yarn node --no-warnings=ExperimentalWarning --loader ts-node/esm util/authorizeEnactUpgrade.ts ${{ steps.wasms.outputs.dir }}/${{ matrix.wasm_name }}-runtime/${{ matrix.wasm_name }}_runtime.compact.compressed.wasm153          yarn node --no-warnings=ExperimentalWarning --loader ts-node/esm ../scripts/authorizeEnactUpgrade.ts ${{ steps.wasms.outputs.dir }}/${{ matrix.wasm_name }}-runtime/${{ matrix.wasm_name }}_runtime.compact.compressed.wasm
154        env:154        env:
155          RPC_URL: ${{ env.RELAY_UNIQUE_HTTP_URL }}155          RPC_URL: ${{ env.RELAY_UNIQUE_HTTP_URL }}
156156
modified.github/workflows/forkless-update-nodata.ymldiffbeforeafterboth
--- a/.github/workflows/forkless-update-nodata.yml
+++ b/.github/workflows/forkless-update-nodata.yml
@@ -165,7 +165,7 @@
           yarn
           ../scripts/wait_for_first_block.sh
           echo "Executing upgrade"
-          yarn node --no-warnings=ExperimentalWarning --loader ts-node/esm util/authorizeEnactUpgrade.ts ${{ steps.wasms.outputs.dir }}/${{ matrix.wasm_name }}-runtime/${{ matrix.wasm_name }}_runtime.compact.compressed.wasm
+          yarn node --no-warnings=ExperimentalWarning --loader ts-node/esm ../scripts/authorizeEnactUpgrade.ts ${{ steps.wasms.outputs.dir }}/${{ matrix.wasm_name }}-runtime/${{ matrix.wasm_name }}_runtime.compact.compressed.wasm
         env:
           RPC_URL: ${{ env.RELAY_UNIQUE_HTTP_URL }}
deletedjs-packages/scripts/generate_types/wait_for_first_block.shdiffbeforeafterboth
--- a/js-packages/scripts/generate_types/wait_for_first_block.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/env bash
-
-DIR=$(dirname "$0")
-
-. "$DIR/functions.sh"
-
-last_block_id=0
-block_id=0
-counter=0
-function get_block {
-    block_id_hex=$(do_rpc chain_getHeader | jq -r .result.number)
-    block_id=$((block_id_hex))
-    echo Id = $block_id
-}
-
-function had_new_block {
-    last_block_id=$block_id
-    get_block
-    if (( last_block_id != 0 && block_id > last_block_id )); then
-        return 0
-    fi
-    return 1
-}
-
-function reset_check {
-    last_block_id=0
-    block_id=0
-    counter=0
-}
-
-while [ ! had_new_block ] && [ $counter -lt 100 ]; do
-    echo "Waiting for next block..."
-    counter=$((counter+1))
-    sleep 12
-done
-
-reset_check
-
-echo "Chain is running, but lets wait for another block after a minute, to avoid startup flakiness."
-sleep 60
-
-while ! had_new_block; do
-    echo "Waiting for another block..."
-    sleep 12
-done
-
-echo "Chain is running!"