ci: Fix QNS log failure (#2425)

* ci: Debug QNS log failure I hate GitHub CI * Speed up * More * More * More * Again * Minimize * Finalize * Fix highlight
mozilla · Feb 6, 2025 · 11607a0 · 11607a0
1 parent 9dec573
commit 11607a0
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 12 deletions.
diff --git a/.github/actions/quic-interop-runner/action.yml b/.github/actions/quic-interop-runner/action.yml
@@ -112,9 +112,8 @@ runs:
       env:
         ARTIFACT_URL: ${{ steps.upload-logs.outputs.artifact-url }}
       run: |
-        jq ". + {log_url: \"$ARTIFACT_URL\"}"
-          < result.json  > result.json.tmp && \
-          mv result.json.tmp result.json
+        jq ". + {log_url: \"$ARTIFACT_URL\"}" < result.json  > result.json.tmp
+        mv result.json.tmp result.json
       shell: bash
 
     - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0

diff --git a/.github/workflows/qns.yml b/.github/workflows/qns.yml
@@ -102,14 +102,30 @@ jobs:
     steps:
       - id: config
         run: |
-          # Add neqo-latest to implementations.json
-          curl https://raw.githubusercontent.com/quic-interop/quic-interop-runner/master/implementations.json | \
-            jq --arg key "$LATEST" --argjson newEntry "
-              {
-                \"image\": \"$IMAGE\",
-                \"url\": \"$URL\",
-                \"role\": \"$ROLE\"
-              }" '.[$key] = $newEntry' > implementations.json
+          # Add neqo-latest and some non-default implementations.
+          # tquic: https://github.com/quic-interop/quic-interop-runner/pull/385/files
+          # openssl: https://github.com/quic-interop/quic-interop-runner/pull/402/files
+          cat <<EOF > additional.json
+          {
+            "neqo-latest": {
+              "image": "$IMAGE",
+              "url": "$URL",
+              "role": "$ROLE"
+            },
+            "tquic": {
+              "image": "tquicgroup/tquic:latest",
+              "url": "https://github.com/Tencent/tquic/",
+              "role": "both"
+            },
+            "openssl": {
+              "image": "quay.io/openssl-ci/openssl-quic-interop",
+              "url": "https://github.com/openssl/openssl",
+              "role": "client"
+            }
+          }
+          EOF
+          curl -o runner.json https://raw.githubusercontent.com/quic-interop/quic-interop-runner/master/implementations.json
+          jq '. += input' runner.json additional.json > implementations.json
           {
             echo "implementations<<EOF"
             cat implementations.json
@@ -230,7 +246,23 @@ jobs:
                 fi
                 [ -n "$RESULT" ] || continue
                 DIFF=$(wdiff -n "$BASELINE" - <<< "$RESULT" || true)
-                RESULT=$(echo "$DIFF" | sed -E "s/\[-/ :rocket:~~/g; s/-\]/~~ /g; s/\{\+/ :warning:\*\*/g; s/\+\}/\*\* /g")
+                if [ "$GROUP" == "failed" ]; then
+                  ADD=":warning:"
+                  ADD_DELIM="\*\*"
+                  DEL=":rocket:"
+                  DEL_DELIM="~~"
+                elif [ "$GROUP" == "succeeded" ]; then
+                  ADD=":rocket:"
+                  ADD_DELIM="~~"
+                  DEL=":warning:"
+                  DEL_DELIM="\*\*"
+                else
+                  ADD=""
+                  ADD_DELIM=""
+                  DEL=""
+                  DEL_DELIM=""
+                fi
+                RESULT=$(echo "$DIFF" | sed -E "s/\[-/ $DEL$DEL_DELIM/g; s/-\]/$DEL_DELIM /g; s/\{\+/ $ADD$ADD_DELIM/g; s/\+\}/$ADD_DELIM /g")
                 echo "* [$PAIR]($LOG): $RESULT" >> "$ROLE.$GROUP.md"
               done
             done