Merge branch 'master' into cmd-test

paritytech-stg · Jun 10, 2024 · 07935ad · 07935ad
2 parents 6e56757 + 547e31a
commit 07935ad
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/.github/workflows/command-bench.yml b/.github/workflows/command-bench.yml
@@ -63,6 +63,19 @@ on:
           - substrate
           - polkadot
           - cumulus
+      runtime_dir:
+        description: Runtime directory
+        type: choice
+        options:
+          - people
+          - collectives
+          - coretime
+          - bridge-hubs
+          - contracts
+          - glutton
+          - starters
+          - testing
+
 
 jobs:
   set-image:     
@@ -90,7 +103,7 @@ jobs:
           GH_TOKEN: ${{ github.token }}
       - name: Run bench
         run: |
-          "./scripts/bench.sh" "${{ inputs.benchmark }}" --runtime "${{ inputs.runtime }}" --pallet "${{ inputs.pallet }}" --target_dir "${{ inputs.target_dir }}" --subcommand "${{ inputs.subcommand }}"
+          "./scripts/bench.sh" "${{ inputs.benchmark }}" --runtime "${{ inputs.runtime }}" --pallet "${{ inputs.pallet }}" --target_dir "${{ inputs.target_dir }}" --subcommand "${{ inputs.subcommand }}" --runtime_dir "${{ inputs.runtime_dir }}"
       - name: Report failure
         if: ${{ failure() }}
         run: gh pr comment ${{ inputs.pr }} --body "<h2>Command failed ❌</h2> Run by @${{ github.actor }} for <code>${{ github.workflow }}</code> failed. See logs <a href=\"$RUN\">here</a>."

diff --git a/scripts/bench.sh b/scripts/bench.sh
@@ -11,8 +11,6 @@
 set -eu -o pipefail
 shopt -s inherit_errexit
 
-ARTIFACTS_DIR="$PWD/.git/.artifacts"
-
 # realpath allows to reuse the current
 BENCH_ROOT_DIR=$(realpath "$(dirname "${BASH_SOURCE[0]}")")
 

diff --git a/scripts/command-utils.sh b/scripts/command-utils.sh
@@ -6,6 +6,8 @@ else
   export LOADED_UTILS_SH=true
 fi
 
+export ARTIFACTS_DIR="$PWD/.git/.artifacts"
+
 die() {
   if [ "${1:-}" ]; then
     >&2 echo "$1"