Skip to content

Commit

Permalink
Merge branch 'master' into cl/issue-3222
Browse files Browse the repository at this point in the history
  • Loading branch information
clearloop committed Sep 27, 2023
2 parents be3de93 + de7ef50 commit e56e55c
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 9 deletions.
13 changes: 8 additions & 5 deletions .github/workflows/PR.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,14 @@ jobs:
build:
needs: status
if: >-
needs.status.outputs.skip-ci != '1' && (
contains(github.event.pull_request.labels.*.name, 'A0-pleasereview')
|| contains(github.event.pull_request.labels.*.name, 'A4-insubstantial')
|| contains(github.event.pull_request.labels.*.name, 'A2-mergeoncegreen')
)
needs.status.outputs.skip-ci != '1'
&& (
contains(github.event.pull_request.title, '[depbot]')
|| (
contains(github.event.pull_request.labels.*.name, 'A0-pleasereview')
|| contains(github.event.pull_request.labels.*.name, 'A4-insubstantial')
|| contains(github.event.pull_request.labels.*.name, 'A2-mergeoncegreen')
))
uses: ./.github/workflows/build.yml
with:
cache: ${{ needs.status.outputs.cache }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
env:
RUSTUP_HOME: /tmp/rustup_home
if: ${{ !contains(github.event.pull_request.title, '[skip-ci]') }}
if: ${{ !contains(github.event.pull_request.title, '[skip-ci]') && github.actor != 'dependabot[bot]' }}
steps:
- uses: actions/checkout@v4

Expand Down
6 changes: 3 additions & 3 deletions scripts/benchmarking/run_all_benchmarks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ BENCHMARK_REPEAT_ONE_TIME_EXTRINSICS=1000
# List of one-time extrinsics to benchmark.
# They are retrieved automatically from the pallet_gear benchmarks file by their `r` component range 0..1,
# which defines them as one-time extrinsics.
ONE_TIME_EXTRINSICS=$(cat "pallets/gear/src/benchmarking/mod.rs" | grep "0 .. 1;" -B 1 | grep -E "{$" | awk '{print $1}')
mapfile -t ONE_TIME_EXTRINSICS < <(cat "pallets/gear/src/benchmarking/mod.rs" | grep "0 .. 1;" -B 1 | grep -E "{$" | awk '{print $1}')

while getopts 'bmfps:c:v' flag; do
case "${flag}" in
Expand Down Expand Up @@ -125,7 +125,7 @@ for PALLET in "${PALLETS[@]}"; do
fi


# Get all the extrinsics for the pallet if the pallet is "pallet_gear"
# Get all the extrinsics for the pallet if the pallet is "pallet_gear".
if [ "$PALLET" == "pallet_gear" ]
then
IFS=',' read -r -a ALL_EXTRINSICS <<< "$(IFS=',' $GEAR benchmark pallet --list \
Expand Down Expand Up @@ -183,7 +183,7 @@ for PALLET in "${PALLETS[@]}"; do
--steps=$BENCHMARK_STEPS_ONE_TIME_EXTRINSICS \
--repeat=$BENCHMARK_REPEAT_ONE_TIME_EXTRINSICS \
--pallet="$PALLET" \
--extrinsic="$(IFS=, ; echo "${ONE_TIME_EXTRINSICS[*]}")" \
--extrinsic="$(IFS=', '; echo "${ONE_TIME_EXTRINSICS[*]}")" \
--execution=wasm \
--wasm-execution=compiled \
--heap-pages=4096 \
Expand Down

0 comments on commit e56e55c

Please sign in to comment.