fixes #535

.github/workflows/benchmark.yml

@@ -29,13 +29,15 @@ jobs:
       - name: Check for runtime changes
         env:
           BASE_BRANCH: ${{ github.event.pull_request.base.ref }}
+          GITHUB_REF_NAME: ${{ github.sha }}
         id: check_runtime
         if: github.event.label.name == 'needs-benchmarks'
         run: .maintain/check_runtime.sh
 
       - name: Benchmark Test
         env:
           BASE_BRANCH: ${{ github.event.pull_request.base.ref }}
+          GITHUB_REF_NAME: ${{ github.sha }}
         if: env.RUNTIME_CHECK == 1
         id: run_benchmarks
         run: .maintain/run_benchmarks.sh

.github/workflows/check.yml

@@ -63,7 +63,7 @@ jobs:
           # TODO: https://github.com/ComposableFi/composable/issues/535
           /home/runner/.cargo/bin/cargo install -f cargo-llvm-cov
           /home/runner/.cargo/bin/rustup component add llvm-tools-preview --toolchain=nightly-2021-11-08
-          SKIP_WASM_BUILD=1 /home/runner/.cargo/bin/cargo +nightly-2021-11-08 llvm-cov --workspace --locked --release --verbose --features=runtime-benchmarks --exclude=integration-tests --lcov --output-path lcov.info 
+          SKIP_WASM_BUILD=1 /home/runner/.cargo/bin/cargo +nightly-2021-11-08 llvm-cov --workspace --locked --release --verbose --features=runtime-benchmarks --lcov --output-path lcov.info
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v1
         with:
@@ -93,7 +93,7 @@ jobs:
       - uses: actions/checkout@v2
       - name: Run Test
         run: |
-          SKIP_WASM_BUILD=1 cargo test --workspace --locked --release --verbose --features=runtime-benchmarks --exclude=integration-tests
+          SKIP_WASM_BUILD=1 cargo test --workspace --locked --release --verbose --features=runtime-benchmarks
 
   linters:
     name: Linters

.github/workflows/release-drafter.yml

@@ -34,6 +34,8 @@ jobs:
 
     - name: Runtime wasm builds
       id: runtime_release
+      env:
+        GITHUB_REF_NAME: ${{ github.sha }}
       run: |
         .maintain/runtime_release.sh
 
@@ -87,6 +89,8 @@ jobs:
         asset_content_type: application/octet-stream
 
     - name: 🔨 Build Composable Binary
+      env:
+        GITHUB_REF_NAME: ${{ github.sha }}
       run: |
         .maintain/client_release.sh
 

.github/workflows/simnode.yml

@@ -20,18 +20,18 @@ jobs:
           docker system prune --force --all --volumes
 
       - uses: actions/checkout@v2
-        with: 
-          ref: main
 
       - name: Check for runtime changes
         id: check_runtime
         env:
           BASE_BRANCH: ${{ github.event.pull_request.base.ref }}
+          GITHUB_REF_NAME: ${{ github.sha }}
         run: .maintain/check_runtime.sh
 
       - name: Run Simnode
         env:
           BASE_BRANCH: ${{ github.event.pull_request.base.ref }}
+          GITHUB_REF_NAME: ${{ github.sha }}
         if: env.RUNTIME_CHECK == 1
         id: run_simnode
         run: .maintain/run_simnode.sh

.maintain/common/lib.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-GITHUB_REF_NAME=$(git rev-parse --abbrev-ref HEAD)
-
 get_latest_release() {
   curl --silent "https://api.github.com/repos/$1/releases/latest" | # Get latest release from GitHub api
     grep '"tag_name":' |                                            # Get tag line

integration-tests/Cargo.toml

@@ -100,11 +100,11 @@ sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0
 
 # added on top of runtime for emulation of network
 paste = "1.0.5"
-polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13" }
+polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13", default-features = false }
 xcm-emulator = { git = "https://github.com/dzmitry-lahoda-forks/xcm-simulator", branch = "dz/0.9.13", default-features = false }
-kusama-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13" }
-polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13" }
-polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13" }
+kusama-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13", default-features = false }
+polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13", default-features = false }
+polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13", default-features = false }
 picasso-runtime = { package = "dali-runtime", path = "../runtime/dali", default-features = false }
 
 [dev-dependencies]
@@ -125,9 +125,9 @@ std = [
 	"sp-block-builder/std",
 	"sp-transaction-pool/std",
 	"sp-inherents/std",
-    "support/std",
+  "support/std",
 	"executive/std",
-    "frame-system/std",
+  "frame-system/std",
 	"utility/std",
 	"authorship/std",
 	"balances/std",
@@ -163,7 +163,11 @@ std = [
 	"xcm-executor/std",
 	"aura/std",
 	"sp-consensus-aura/std",
-    "scale-info/std",
+  "scale-info/std",
+  "kusama-runtime/std",
+  "polkadot-core-primitives/std",
+  "polkadot-primitives/std",
+  "polkadot-runtime-parachains/std",
 ]
 
 runtime-benchmarks = [
@@ -189,6 +193,9 @@ runtime-benchmarks = [
 	"democracy/runtime-benchmarks",
 	"utility/runtime-benchmarks",
 	"kusama-runtime/runtime-benchmarks",
+  "picasso-runtime/runtime-benchmarks",
+  "polkadot-primitives/runtime-benchmarks",
+  "polkadot-runtime-parachains/runtime-benchmarks",
 ]
 
 develop = [

node/Cargo.toml

@@ -91,7 +91,7 @@ hex = "0.4.3"
 
 [features]
 default = []
-runtime-benchmarks = ["picasso-runtime/runtime-benchmarks", "composable-runtime/runtime-benchmarks", "dali-runtime/runtime-benchmarks"]
+runtime-benchmarks = ["polkadot-service/runtime-benchmarks", "picasso-runtime/runtime-benchmarks", "composable-runtime/runtime-benchmarks", "dali-runtime/runtime-benchmarks"]
 ocw = []
 dali = ["dali-runtime"]
 composable = ["composable-runtime"]

scripts/polkadot-launch/composable.json

@@ -26,6 +26,12 @@
         "wsPort": 9977,
         "basePath": "/tmp/polkadot-launch/relaychains/dave",
         "port": 30777
+      },
+      {
+        "name": "ferdie",
+        "wsPort": 9977,
+        "basePath": "/tmp/polkadot-launch/relaychains/ferdie",
+        "port": 30777
       }
     ],
     "genesis": {