Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/github_actions/peter-evans/crea…
Browse files Browse the repository at this point in the history
…te-or-update-comment-4
  • Loading branch information
tmpolaczyk authored Feb 3, 2025
2 parents b6e4fc2 + 207f40b commit 92cac61
Show file tree
Hide file tree
Showing 69 changed files with 2,238 additions and 1,180 deletions.
76 changes: 76 additions & 0 deletions .github/workflow-templates/bridge-e2e/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
name: Bridge e2e tests
description: |
Setup and run bridge e2e tests between tanssi and ethereum
runs:
using: "composite"
steps:
- name: Check g++
shell: bash
id: setup_g_plusplus
run: |
g++ --version
- name: Check protoc
shell: bash
id: check_proto_c
run: |
protoc --version
- name: Check jq
shell: bash
id: check_jq
run: |
jq --version
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: '^1.22.0'
- name: Check go
shell: bash
id: check_go
run: |
go version
- name: Run Mage
uses: magefile/mage-action@v3
with:
install-only: true
- name: Check mage
shell: bash
id: check_mage
run: |
mage --version
- name: Install Foundry
uses: foundry-rs/foundry-toolchain@v1
- name: Check forge
shell: bash
id: check_forge
run: |
forge --version
- name: Pnpm
uses: pnpm/[email protected]
with:
version: 9
- name: Use Node.js 22.x
uses: actions/setup-node@v4
with:
node-version: 22.x
- name: Install yarn
shell: bash
run: |-
curl -fsSL --create-dirs -o $HOME/bin/yarn \
https://github.com/yarnpkg/yarn/releases/download/v1.22.22/yarn-1.22.22.js
chmod +x $HOME/bin/yarn
echo "$HOME/bin" >> $GITHUB_PATH
- name: Check yarn
shell: bash
id: check_yarn
run: |
yarn --version
- name: Check date
shell: bash
id: check_date
run: |
date --version
- name: Run Zombienet Test zombie_tanssi_relay_eth_bridge
uses: ./.github/workflow-templates/zombienet-tests
with:
test_name: zombie_tanssi_relay_eth_bridge
1 change: 1 addition & 0 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
push:
branches:
- master
merge_group:

env:
NODE_OPTIONS: "--max-old-space-size=12288"
Expand Down
86 changes: 5 additions & 81 deletions .github/workflows/e2e-test-bridge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ on:

jobs:
e2e-bridge-test:
if: ${{ github.event_name == 'merge_group' }}
runs-on: self-hosted
steps:
- name: Retrieve run id
Expand All @@ -37,87 +38,10 @@ jobs:
fi
- name: Checkout
uses: actions/checkout@v4
- name: Check g++
id: setup_g_plusplus
run: |
g++ --version
- name: Check protoc
id: check_proto_c
run: |
protoc --version
- name: Check jq
id: check_jq
run: |
jq --version
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: '^1.22.0'
- name: Check go
id: check_go
run: |
go version
- name: Run Mage
uses: magefile/mage-action@v3
with:
install-only: true
- name: Check mage
id: check_mage
run: |
mage --version
- name: Install Foundry
uses: foundry-rs/foundry-toolchain@v1
- name: Check forge
id: check_forge
run: |
forge --version
- name: Pnpm
uses: pnpm/[email protected]
with:
version: 9
- name: Use Node.js 22.x
uses: actions/setup-node@v4
with:
node-version: 22.x
- name: Install yarn
run: |-
curl -fsSL --create-dirs -o $HOME/bin/yarn \
https://github.com/yarnpkg/yarn/releases/download/v1.22.22/yarn-1.22.22.js
chmod +x $HOME/bin/yarn
echo "$HOME/bin" >> $GITHUB_PATH
- name: Check yarn
id: check_yarn
run: |
yarn --version
- name: Check date
id: check_date
run: |
date --version
- name: Check output
id: check_output
run: |
echo ${{ steps.retrieve-run-id.outputs.run_sha }}
- name: Download build artifact from triggered workflow
uses: dawidd6/action-download-artifact@v7
with:
commit: ${{ steps.retrieve-run-id.outputs.run_sha }}
workflow: release.yml
name: binaries
path: target/release
allow_forks: false
- name: "Make binaries executable"
shell: bash
run: |
chmod uog+x target/release/tanssi-node
chmod uog+x target/release/tanssi-relay
chmod uog+x target/release/tanssi-relay-prepare-worker
chmod uog+x target/release/tanssi-relay-execute-worker
chmod uog+x target/release/container-chain-simple-node
chmod uog+x target/release/container-chain-frontier-node
- name: Run Zombienet Test zombie_tanssi_relay_eth_bridge
uses: ./.github/workflow-templates/zombienet-tests
with:
test_name: zombie_tanssi_relay_eth_bridge

- name: Run Zombienet Test ${{ matrix.test_name }}
uses: ./.github/workflow-templates/bridge-e2e

- name: Commit Action Status
uses: LouisBrunner/[email protected]
with:
Expand Down
60 changes: 58 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
branches:
- master
- perm-*
merge_group:

jobs:
set-tags:
Expand Down Expand Up @@ -646,7 +647,7 @@ jobs:
strategy:
fail-fast: false
matrix:
test_name: [zombie_tanssi, zombie_tanssi_parathreads, zombie_tanssi_rotation, zombie_tanssi_warp_sync, zombie_tanssi_relay, zombie_data_preservers]
test_name: [zombie_tanssi, zombie_tanssi_relay]
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -670,7 +671,62 @@ jobs:
uses: ./.github/workflow-templates/zombienet-tests
with:
test_name: ${{ matrix.test_name }}

zombienet-tests-merge-queue:
if: ${{ github.event_name == 'merge_group' }}
runs-on: self-hosted
needs: ["set-tags", "build"]
strategy:
fail-fast: false
matrix:
test_name: [zombie_tanssi_warp_sync, zombie_data_preservers, zombie_tanssi_parathreads, zombie_tanssi_rotation]
steps:
- name: Checkout
uses: actions/checkout@v4
with:
ref: ${{ needs.set-tags.outputs.git_ref }}
- name: "Download binaries"
uses: actions/download-artifact@v4
with:
name: binaries
path: target/release
- name: "Make binaries executable"
shell: bash
run: |
chmod uog+x target/release/tanssi-node
chmod uog+x target/release/tanssi-relay
chmod uog+x target/release/tanssi-relay-prepare-worker
chmod uog+x target/release/tanssi-relay-execute-worker
chmod uog+x target/release/container-chain-simple-node
chmod uog+x target/release/container-chain-frontier-node
- name: Run Zombienet Test ${{ matrix.test_name }}
uses: ./.github/workflow-templates/zombienet-tests
with:
test_name: ${{ matrix.test_name }}
zombienet-tests-merge-queue-bridge-e2e:
if: ${{ github.event_name == 'merge_group' }}
runs-on: self-hosted
needs: ["set-tags", "build"]
steps:
- name: Checkout
uses: actions/checkout@v4
with:
ref: ${{ needs.set-tags.outputs.git_ref }}
- name: "Download binaries"
uses: actions/download-artifact@v4
with:
name: binaries
path: target/release
- name: "Make binaries executable"
shell: bash
run: |
chmod uog+x target/release/tanssi-node
chmod uog+x target/release/tanssi-relay
chmod uog+x target/release/tanssi-relay-prepare-worker
chmod uog+x target/release/tanssi-relay-execute-worker
chmod uog+x target/release/container-chain-simple-node
chmod uog+x target/release/container-chain-frontier-node
- name: Run Zombienet Test ${{ matrix.test_name }}
uses: ./.github/workflow-templates/bridge-e2e
chopsticks-upgrade-test:
runs-on:
labels: ubuntu-latest
Expand Down
4 changes: 4 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions chains/orchestrator-paras/runtime/common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ scale-info = { workspace = true, features = [ "derive" ] }
# Own
pallet-configuration = { workspace = true }
pallet-data-preservers = { workspace = true }
pallet-external-validator-slashes = { workspace = true }
pallet-external-validators = { workspace = true }
pallet-foreign-asset-creator = { workspace = true }
pallet-invulnerables = { workspace = true }
Expand Down Expand Up @@ -50,6 +51,7 @@ staging-xcm = { workspace = true }

sp-core = { workspace = true }
sp-runtime = { workspace = true }
sp-staking = { workspace = true }
sp-std = { workspace = true }

# Cumulus
Expand All @@ -70,6 +72,7 @@ std = [
"pallet-beefy-mmr/std",
"pallet-configuration/std",
"pallet-data-preservers/std",
"pallet-external-validator-slashes/std",
"pallet-external-validators/std",
"pallet-foreign-asset-creator/std",
"pallet-invulnerables/std",
Expand All @@ -84,6 +87,7 @@ std = [
"scale-info/std",
"sp-core/std",
"sp-runtime/std",
"sp-staking/std",
"sp-std/std",
"staging-xcm/std",
]
Expand All @@ -97,6 +101,7 @@ runtime-benchmarks = [
"pallet-beefy-mmr/runtime-benchmarks",
"pallet-configuration/runtime-benchmarks",
"pallet-data-preservers/runtime-benchmarks",
"pallet-external-validator-slashes/runtime-benchmarks",
"pallet-external-validators/runtime-benchmarks",
"pallet-foreign-asset-creator/runtime-benchmarks",
"pallet-invulnerables/runtime-benchmarks",
Expand All @@ -107,6 +112,7 @@ runtime-benchmarks = [
"pallet-treasury/runtime-benchmarks",
"pallet-xcm/runtime-benchmarks",
"sp-runtime/runtime-benchmarks",
"sp-staking/runtime-benchmarks",
]

try-runtime = [
Expand All @@ -118,6 +124,7 @@ try-runtime = [
"pallet-beefy-mmr/try-runtime",
"pallet-configuration/try-runtime",
"pallet-data-preservers/try-runtime",
"pallet-external-validator-slashes/try-runtime",
"pallet-external-validators/try-runtime",
"pallet-foreign-asset-creator/try-runtime",
"pallet-invulnerables/try-runtime",
Expand Down
Loading

0 comments on commit 92cac61

Please sign in to comment.