From 16babf36799fae559cb0159a28bd02b278053335 Mon Sep 17 00:00:00 2001 From: Assem Date: Mon, 18 Mar 2024 13:07:48 +0100 Subject: [PATCH] =?UTF-8?q?fix:=20publish=20`chainflip-engine1.3`=20to=20d?= =?UTF-8?q?ebian=20packages=20=F0=9F=90=9E=20(#4653)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: publish `chainflip-engine1.3` to debian packages 🐞 * chore: run `systemd` checks on pushed release branches 🕵🏻‍♂️ * chore: test changes * chore: test * chrore: revert manual changes to sisyphos workflow --- .github/workflows/_03_release_checks.yml | 30 ++++++------------- .github/workflows/release-sisyphos.yml | 4 +++ ci/scripts/check_runtime_spec_version.sh | 7 ++++- engine/Cargo.toml | 6 ++-- ....2.service => chainflip-engine1.3.service} | 2 +- ....2.service => chainflip-engine1.3.service} | 2 +- ....2.service => chainflip-engine1.3.service} | 2 +- 7 files changed, 25 insertions(+), 28 deletions(-) rename engine/package/berghain/{chainflip-engine1.2.service => chainflip-engine1.3.service} (76%) rename engine/package/perseverance/{chainflip-engine1.2.service => chainflip-engine1.3.service} (82%) rename engine/package/sisyphos/{chainflip-engine1.2.service => chainflip-engine1.3.service} (76%) diff --git a/.github/workflows/_03_release_checks.yml b/.github/workflows/_03_release_checks.yml index 5ccb7bf07c..cddc24b2d2 100644 --- a/.github/workflows/_03_release_checks.yml +++ b/.github/workflows/_03_release_checks.yml @@ -1,10 +1,6 @@ on: workflow_call: inputs: - tag: - type: string - required: false - default: ${{ github.ref_name }} network: type: string required: false @@ -41,37 +37,29 @@ jobs: run: | echo "version=$(cargo read-manifest --manifest-path ${{ matrix.manifest }} | jq -r .version)" >> $GITHUB_OUTPUT + - name: Check systemd files and debian package config 👀 + shell: bash + run: ./ci/scripts/check_engine_systemd_config.sh ${{ steps.cargo.outputs.version }} + - name: Check tag version matches Cargo.toml 🕵️‍♂️ shell: bash + if: inputs.network != 'sisyphos' run: | - if [[ "${{ inputs.tag }}" != "${{ steps.cargo.outputs.version }}" ]]; then - echo "Tag version (${{ inputs.tag }}) does not match version (${{ steps.cargo.outputs.version }}) in ${{ matrix.manifest }}" + if [[ "${{ github.ref_name }}" != "${{ steps.cargo.outputs.version }}" ]]; then + echo "Tag version (${{ github.ref_name }}) does not match version (${{ steps.cargo.outputs.version }}) in ${{ matrix.manifest }}" exit 1 fi - - name: Check systemd files and debian package config 👀 - shell: bash - run: ./ci/scripts/check_engine_systemd_config.sh ${{ inputs.tag }} - - check-engine-systemd: - runs-on: ubuntu-latest - steps: - - name: Checkout 🏁 - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - - - name: Check systemd files and debian package config 👀 - shell: bash - run: ./ci/scripts/check_engine_systemd_config.sh ${{ inputs.tag }} - check-changelog: runs-on: ubuntu-latest + if: inputs.network != 'sisyphos' steps: - name: Checkout 🏁 uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - name: Check changelog 📝 shell: bash - run: ./ci/scripts/check_changelog.sh ${{ inputs.tag }} + run: ./ci/scripts/check_changelog.sh ${{ github.ref_name }} check-runtime-spec-version: runs-on: ubuntu-latest diff --git a/.github/workflows/release-sisyphos.yml b/.github/workflows/release-sisyphos.yml index 167d05aa82..ff6c21a146 100644 --- a/.github/workflows/release-sisyphos.yml +++ b/.github/workflows/release-sisyphos.yml @@ -12,6 +12,10 @@ jobs: pre-check: uses: ./.github/workflows/_01_pre_check.yml secrets: inherit + release-checks: + uses: ./.github/workflows/_03_release_checks.yml + with: + network: "sisyphos" test: uses: ./.github/workflows/_10_test.yml secrets: inherit diff --git a/ci/scripts/check_runtime_spec_version.sh b/ci/scripts/check_runtime_spec_version.sh index 5b9f10d447..4ecde6dfd2 100755 --- a/ci/scripts/check_runtime_spec_version.sh +++ b/ci/scripts/check_runtime_spec_version.sh @@ -14,8 +14,13 @@ fi if [ $network == "berghain" ]; then RPC_ENDPOINT="https://mainnet-archive.chainflip.io" +elif [ $network == "perseverance" ]; then + RPC_ENDPOINT="https://archive.perseverance.chainflip.io" +elif [ $network == "sisyphos" ]; then + RPC_ENDPOINT="https://archive.sisyphos.chainflip.io" else - RPC_ENDPOINT="https://perseverance.chainflip.xyz" + echo "Invalid network" + exit 1 fi live_runtime_version=$(curl -s -H "Content-Type: application/json" -d '{"id":1, "jsonrpc":"2.0", "method": "state_getRuntimeVersion", "params":[]}' $RPC_ENDPOINT | jq .result.specVersion) diff --git a/engine/Cargo.toml b/engine/Cargo.toml index b46c594830..73ee1845c4 100644 --- a/engine/Cargo.toml +++ b/engine/Cargo.toml @@ -11,14 +11,14 @@ extended-description = """\ Chainflip Validator Engine Package""" maintainer = "Chainflip Labs GmbH " maintainer-scripts = "package/" -name = "chainflip-engine1.2" +name = "chainflip-engine1.3" priority = "required" section = "rust" -systemd-units = [{ unit-name = "chainflip-engine1.2", enable = false }] +systemd-units = [{ unit-name = "chainflip-engine1.3", enable = false }] assets = [ [ "target/release/chainflip-engine", - "usr/bin/chainflip-engine1.2", + "usr/bin/chainflip-engine1.3", "755", ], ] diff --git a/engine/package/berghain/chainflip-engine1.2.service b/engine/package/berghain/chainflip-engine1.3.service similarity index 76% rename from engine/package/berghain/chainflip-engine1.2.service rename to engine/package/berghain/chainflip-engine1.3.service index 0154fc86c1..9a3c5401dc 100644 --- a/engine/package/berghain/chainflip-engine1.2.service +++ b/engine/package/berghain/chainflip-engine1.3.service @@ -7,7 +7,7 @@ Restart=always RestartSec=30 Type=simple -ExecStart=/usr/bin/chainflip-engine1.2 --config-root /etc/chainflip/ +ExecStart=/usr/bin/chainflip-engine1.3 --config-root /etc/chainflip/ LimitNOFILE=16000 LimitNOFILESoft=16000 diff --git a/engine/package/perseverance/chainflip-engine1.2.service b/engine/package/perseverance/chainflip-engine1.3.service similarity index 82% rename from engine/package/perseverance/chainflip-engine1.2.service rename to engine/package/perseverance/chainflip-engine1.3.service index c1a562cabb..47d227fd65 100644 --- a/engine/package/perseverance/chainflip-engine1.2.service +++ b/engine/package/perseverance/chainflip-engine1.3.service @@ -7,7 +7,7 @@ Restart=always RestartSec=30 Type=simple -ExecStart=/usr/bin/chainflip-engine1.2 --config-root /etc/chainflip/ +ExecStart=/usr/bin/chainflip-engine1.3 --config-root /etc/chainflip/ Environment=RUST_LOG="chainflip_engine=debug,multisig=debug,warn,chainflip_engine::p2p=error" LimitNOFILE=16000 LimitNOFILESoft=16000 diff --git a/engine/package/sisyphos/chainflip-engine1.2.service b/engine/package/sisyphos/chainflip-engine1.3.service similarity index 76% rename from engine/package/sisyphos/chainflip-engine1.2.service rename to engine/package/sisyphos/chainflip-engine1.3.service index 0154fc86c1..9a3c5401dc 100644 --- a/engine/package/sisyphos/chainflip-engine1.2.service +++ b/engine/package/sisyphos/chainflip-engine1.3.service @@ -7,7 +7,7 @@ Restart=always RestartSec=30 Type=simple -ExecStart=/usr/bin/chainflip-engine1.2 --config-root /etc/chainflip/ +ExecStart=/usr/bin/chainflip-engine1.3 --config-root /etc/chainflip/ LimitNOFILE=16000 LimitNOFILESoft=16000