Skip to content

Commit 1a491ac

Browse files
authored
Merge branch 'main' into update_AMD_dsr1fp8_images
2 parents e55d426 + 7c33829 commit 1a491ac

2 files changed

Lines changed: 11 additions & 8 deletions

File tree

.github/workflows/label-validation.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ concurrency:
77

88
on:
99
pull_request_target:
10-
types: [labeled, synchronize]
10+
types: labeled
1111

1212
jobs:
1313
get-jobs:
@@ -83,12 +83,15 @@ jobs:
8383
8484
validate:
8585
needs: get-jobs
86-
if: ${{ needs.get-jobs.outputs.search-space-config != '[]' }}
86+
if: ${{ always() && needs.get-jobs.result == 'success' && needs.get-jobs.outputs.search-space-config != '[]' }}
8787
uses: ./.github/workflows/benchmark-tmpl.yml
8888
strategy:
8989
fail-fast: false
9090
matrix:
91-
config: ${{ fromJson(needs.get-jobs.outputs.search-space-config) }}
91+
# The '|| '[]'' fallback is required because GitHub evaluates the matrix expression
92+
# before the 'if' condition. Without it, fromJson() throws a parse error when the
93+
# output is empty/undefined (e.g., when get-jobs is pending approval or was skipped).
94+
config: ${{ fromJson(needs.get-jobs.outputs.search-space-config || '[]') }}
9295
secrets: inherit
9396
name: validate ${{ matrix.config.runner }}
9497
with:
@@ -107,14 +110,14 @@ jobs:
107110
conc: ${{ matrix.config.conc }}
108111

109112
collect-results:
110-
needs: validate
111-
if: ${{ always() }}
113+
needs: [get-jobs, validate]
114+
if: ${{ always() && needs.get-jobs.result == 'success' }}
112115
uses: ./.github/workflows/collect-results.yml
113116
secrets: inherit
114117

115118
calc-success-rate:
116-
needs: collect-results
117-
if: ${{ always() }}
119+
needs: [get-jobs, collect-results]
120+
if: ${{ always() && needs.get-jobs.result == 'success' }}
118121
runs-on: ubuntu-latest
119122

120123
env:

benchmarks/benchmark_lib.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ wait_for_server_ready() {
5757
fi
5858

5959
# Show logs until server is ready
60-
tail -f "$server_log" &
60+
tail -f -n +1 "$server_log" &
6161
local TAIL_PID=$!
6262
until curl --output /dev/null --silent --fail http://0.0.0.0:$port/health; do
6363
if ! kill -0 "$server_pid" 2>/dev/null; then

0 commit comments

Comments
 (0)