@@ -173,7 +173,6 @@ jobs:
173173 }
174174 }
175175 EOF
176-
177176 if [ -n "$MAIN_IMAGE" ]; then
178177 # Add neqo-main
179178 cat <<EOF > neqo-main.json
@@ -188,22 +187,18 @@ jobs:
188187 jq '. += input' neqo-main.json additional.json > temp.json
189188 mv temp.json additional.json
190189 fi
191-
192- # Merge all implementations
193190 curl -o runner.json https://raw.githubusercontent.com/quic-interop/quic-interop-runner/master/implementations.json
194191 jq '. += input' runner.json additional.json > implementations.json
195192 {
196193 echo "implementations<<EOF"
197194 cat implementations.json
198195 echo "EOF"
199196 } >> "$GITHUB_OUTPUT"
200-
197+ # Determine valid interop pairs
201198 if [ -n "$MAIN_IMAGE" ]; then
202- # For PRs, generate pairs for both neqo-pr and neqo-main, where each runs against all other implementations but not itself.
203199 # shellcheck disable=SC2016
204200 CONDITION='select(contains("neqo-pr") != contains("neqo-main") and $client != $server)'
205201 else
206- # For non-PRs, only generate pairs for neqo-pr
207202 # shellcheck disable=SC2016
208203 CONDITION='select(contains("neqo-pr") and $client != $server)'
209204 fi
@@ -215,7 +210,6 @@ jobs:
215210 \$client + \" $DELIM \" + \$server |
216211 $CONDITION
217212 ]" > pairs.json
218-
219213 {
220214 echo "pairs<<EOF"
221215 cat pairs.json
@@ -308,7 +302,6 @@ jobs:
308302 PREFIX=$(echo "$PREFIX" | tr -d '"')
309303 # Skip neqo-main results as they're only used as baseline
310304 [[ "$PREFIX" == *"neqo-main"* ]] && continue
311-
312305 CLIENT=$(echo "$PREFIX" | cut -f1 -d " ")
313306 SERVER=$(echo "$PREFIX" | cut -f3 -d " ")
314307 if [ "$CLIENT" == "$PR" ]; then
@@ -338,14 +331,12 @@ jobs:
338331 for GROUP in $(jq -r < "$RUN/$ROLE.grouped.json" '.results | keys[]'); do
339332 PR_RESULT=$(jq < "$RUN/$ROLE.grouped.json" -r '.results.'"$GROUP"'[]' | fmt -w 1000)
340333 LOG=$(jq -r < "$RUN/$ROLE.grouped.json" -r '.log_url')
341-
342334 # Get baseline from neqo-main if PR, otherwise no baseline
343335 BASELINE=$(mktemp)
344336 MAIN_RUN="${RUN/$PR/neqo-main}/$ROLE.grouped.json"
345337 if [ -e "$MAIN_RUN" ]; then
346338 jq < "$MAIN_RUN" -r '.results.'"$GROUP"'[]' | fmt -w 1000 > "$BASELINE"
347339 fi
348-
349340 [ -n "$PR_RESULT" ] || continue
350341 DIFF=$(wdiff -n "$BASELINE" - <<< "$PR_RESULT" || true)
351342 ADD=""
0 commit comments