File tree Expand file tree Collapse file tree 12 files changed +16
-16
lines changed
Expand file tree Collapse file tree 12 files changed +16
-16
lines changed Original file line number Diff line number Diff line change @@ -115,7 +115,7 @@ jobs:
115115 steps :
116116 - run : |
117117 tee resultfile <<< '${{ toJSON(needs) }}'
118- FAILURES=$(cat resultfile | grep '"result": "failure"' | wc -l)
118+ FAILURES=$(cat resultfile | grep -E '"result": "( failure|cancelled) "' | wc -l)
119119 if [ $FAILURES -gt 0 ]; then
120120 echo "### At least one required job failed ❌" >> $GITHUB_STEP_SUMMARY
121121 exit 1
Original file line number Diff line number Diff line change @@ -724,7 +724,7 @@ jobs:
724724 id : check_success
725725 run : |
726726 tee resultfile <<< '${{ toJSON(needs) }}'
727- FAILURES=$(cat resultfile | grep '"result": "failure"' | wc -l)
727+ FAILURES=$(cat resultfile | grep -E '"result": "( failure|cancelled) "' | wc -l)
728728 if [ $FAILURES -gt 0 ]; then
729729 echo "### At least one required job failed ❌" >> $GITHUB_STEP_SUMMARY
730730 echo "build_success=false" >> $GITHUB_OUTPUT
@@ -780,7 +780,7 @@ jobs:
780780 id : check_success
781781 run : |
782782 tee resultfile <<< '${{ toJSON(needs) }}'
783- FAILURES=$(grep -c '"result": "failure"' resultfile || true )
783+ FAILURES=$(cat resultfile | grep -E '"result": "( failure|cancelled) "' | wc -l )
784784 if [ "$FAILURES" -gt 0 ]; then
785785 echo "### At least one zombienet job failed ❌" >> $GITHUB_STEP_SUMMARY
786786 exit 1
Original file line number Diff line number Diff line change @@ -118,7 +118,7 @@ jobs:
118118 steps :
119119 - run : |
120120 tee resultfile <<< '${{ toJSON(needs) }}'
121- FAILURES=$(cat resultfile | grep '"result": "failure"' | wc -l)
121+ FAILURES=$(cat resultfile | grep -E '"result": "( failure|cancelled) "' | wc -l)
122122 if [ $FAILURES -gt 0 ]; then
123123 echo "### At least one required job failed ❌" >> $GITHUB_STEP_SUMMARY
124124 exit 1
Original file line number Diff line number Diff line change @@ -100,7 +100,7 @@ jobs:
100100 forklift cargo build --release --locked -p $PACKAGE_NAME -p frame-omni-bencher --features=${{ matrix.runtime.bench_features }} --quiet
101101 echo "Running short $BENCH_CMD benchmarking for PACKAGE_NAME=$PACKAGE_NAME and RUNTIME_BLOB_PATH=$RUNTIME_BLOB_PATH"
102102 ls -lrt $RUNTIME_BLOB_PATH
103-
103+
104104 if [[ "$BENCH_CMD" == "pallet" ]]; then
105105 cmd="./target/release/frame-omni-bencher v1 benchmark pallet --runtime $RUNTIME_BLOB_PATH --all --steps 2 --repeat 1 $FLAGS"
106106 elif [[ "$BENCH_CMD" == "overhead" ]]; then
@@ -127,7 +127,7 @@ jobs:
127127 steps :
128128 - run : |
129129 tee resultfile <<< '${{ toJSON(needs) }}'
130- FAILURES=$(cat resultfile | grep '"result": "failure"' | wc -l)
130+ FAILURES=$(cat resultfile | grep -E '"result": "( failure|cancelled) "' | wc -l)
131131 if [ $FAILURES -gt 0 ]; then
132132 echo "### At least one required job failed ❌" >> $GITHUB_STEP_SUMMARY
133133 exit 1
Original file line number Diff line number Diff line change @@ -100,7 +100,7 @@ jobs:
100100 steps :
101101 - run : |
102102 tee resultfile <<< '${{ toJSON(needs) }}'
103- FAILURES=$(cat resultfile | grep '"result": "failure"' | wc -l)
103+ FAILURES=$(cat resultfile | grep -E '"result": "( failure|cancelled) "' | wc -l)
104104 if [ $FAILURES -gt 0 ]; then
105105 echo "### At least one required job failed ❌" >> $GITHUB_STEP_SUMMARY
106106 exit 1
Original file line number Diff line number Diff line change @@ -141,7 +141,7 @@ jobs:
141141 steps :
142142 - run : |
143143 tee resultfile <<< '${{ toJSON(needs) }}'
144- FAILURES=$(cat resultfile | grep '"result": "failure"' | wc -l)
144+ FAILURES=$(cat resultfile | grep -E '"result": "( failure|cancelled) "' | wc -l)
145145 if [ $FAILURES -gt 0 ]; then
146146 echo "### At least one required job failed ❌" >> $GITHUB_STEP_SUMMARY
147147 exit 1
Original file line number Diff line number Diff line change @@ -157,7 +157,7 @@ jobs:
157157
158158 # Extract the umbrella crate version dynamically from cargo metadata
159159 UMBRELLA_VERSION=$(cargo metadata --format-version=1 | jq -r '.packages[] | select(.manifest_path | endswith("umbrella/Cargo.toml")) | .version')
160-
160+
161161 if [ -z "$UMBRELLA_VERSION" ]; then
162162 echo "Warning: Could not determine umbrella version from cargo metadata, using fallback version 0.1.0"
163163 UMBRELLA_VERSION="0.1.0"
@@ -254,7 +254,7 @@ jobs:
254254 steps :
255255 - run : |
256256 tee resultfile <<< '${{ toJSON(needs) }}'
257- FAILURES=$(cat resultfile | grep '"result": "failure"' | wc -l)
257+ FAILURES=$(cat resultfile | grep -E '"result": "( failure|cancelled) "' | wc -l)
258258 if [ $FAILURES -gt 0 ]; then
259259 echo "### At least one required job failed ❌" >> $GITHUB_STEP_SUMMARY
260260 exit 1
Original file line number Diff line number Diff line change @@ -110,7 +110,7 @@ jobs:
110110 steps :
111111 - run : |
112112 tee resultfile <<< '${{ toJSON(needs) }}'
113- FAILURES=$(cat resultfile | grep '"result": "failure"' | wc -l)
113+ FAILURES=$(cat resultfile | grep -E '"result": "( failure|cancelled) "' | wc -l)
114114 if [ $FAILURES -gt 0 ]; then
115115 echo "### At least one required job failed ❌" >> $GITHUB_STEP_SUMMARY
116116 exit 1
Original file line number Diff line number Diff line change @@ -105,7 +105,7 @@ jobs:
105105 steps :
106106 - run : |
107107 tee resultfile <<< '${{ toJSON(needs) }}'
108- FAILURES=$(cat resultfile | grep '"result": "failure"' | wc -l)
108+ FAILURES=$(cat resultfile | grep -E '"result": "( failure|cancelled) "' | wc -l)
109109 if [ $FAILURES -gt 0 ]; then
110110 echo "### At least one required job failed ❌" >> $GITHUB_STEP_SUMMARY
111111 exit 1
Original file line number Diff line number Diff line change @@ -157,7 +157,7 @@ jobs:
157157 steps :
158158 - run : |
159159 tee resultfile <<< '${{ toJSON(needs) }}'
160- FAILURES=$(cat resultfile | grep '"result": "failure"' | wc -l)
160+ FAILURES=$(cat resultfile | grep -E '"result": "( failure|cancelled) "' | wc -l)
161161 if [ $FAILURES -gt 0 ]; then
162162 echo "### At least one required job failed ❌" >> $GITHUB_STEP_SUMMARY
163163 exit 1
You can’t perform that action at this time.
0 commit comments