Update benchmark.yml

arangoml · Dec 23, 2023 · 12adb6e · 12adb6e
1 parent ef6a746
commit 12adb6e
Showing 1 changed file with 22 additions and 34 deletions.
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -49,10 +49,10 @@ jobs:
         run: python benchmark/write.py --output_dir master
 
       - name: Echo PyG to ArangoDB
-        run: cat benchmark/traces/master/pyg_to_arangodb.json | jq
+        run: cat benchmark/traces/master/pyg_to_arangodb.json | jq .
 
       - name: Echo ArangoDB to PyG 
-        run: cat benchmark/traces/master/arangodb_to_pyg.json | jq
+        run: cat benchmark/traces/master/arangodb_to_pyg.json | jq .
 
       # - name: Make commit for auto-generated benchmark files
       #   uses: EndBug/add-and-commit@v9
@@ -105,59 +105,47 @@ jobs:
         run: python benchmark/write.py --output_dir branch
 
       - name: Compare PR traces against Master traces
-        id: python_script
         run: |
           echo "ROOT_SPAN_COMPARISON<<EOF" >> $GITHUB_ENV
           python benchmark/compare.py >> $GITHUB_ENV
           echo "EOF" >> $GITHUB_ENV
 
-      - run: echo "PYG_TO_ARANGODB_DIFF=$(jq -c . < benchmark/diff/pyg_to_arangodb.json)" >> $GITHUB_ENV
-      - run: echo "ARANGODB_TO_PYG_DIFF=$(jq -c . < benchmark/diff/arangodb_to_pyg.json)" >> $GITHUB_ENV
+      - name: Extract PyG to ArangoDB Diff
+        run: |
+          echo "PYG_TO_ARANGODB_DIFF<<EOF" >> $GITHUB_ENV
+          cat benchmark/diff/pyg_to_arangodb.json | jq . >> $GITHUB_ENV
+          echo "EOF" >> $GITHUB_ENV
+
+      - name: Extract ArangoDB to PyG Diff
+        run: |
+          echo "ARANGODB_TO_PYG_DIFF<<EOF" >> $GITHUB_ENV
+          cat benchmark/diff/arangodb_to_pyg.json | jq . >> $GITHUB_ENV
+          echo "EOF" >> $GITHUB_ENV
 
       - name: Prepare PR Message
         run: |
           echo 'MESSAGE<<EOF' >> $GITHUB_ENV
           echo "Benchmark (${{ github.event.pull_request.head.sha }})" >> $GITHUB_ENV
           echo '' >> $GITHUB_ENV
-          echo 'Root Span Comparisons:' >> $GITHUB_ENV
           echo '```json' >> $GITHUB_ENV
           echo "$ROOT_SPAN_COMPARISON" | jq . >> $GITHUB_ENV
           echo '```' >> $GITHUB_ENV
           echo '' >> $GITHUB_ENV
-          echo '<details><summary>ArangoDB to PyG Comparison</summary>' >> $GITHUB_ENV
+          echo '<details><summary>PyG to ArangoDB Diff</summary>' >> $GITHUB_ENV
           echo '' >> $GITHUB_ENV
           echo '```json' >> $GITHUB_ENV
-          cat $ARANGODB_TO_PYG_DIFF | jq . >> $GITHUB_ENV
+          echo "$PYG_TO_ARANGODB_DIFF" | jq . >> $GITHUB_ENV
+          echo '```' >> $GITHUB_ENV
+          echo '</details>' >> $GITHUB_ENV
+          echo '' >> $GITHUB_ENV
+          echo '<details><summary>ArangoDB to PyG Diff</summary>' >> $GITHUB_ENV
+          echo '' >> $GITHUB_ENV
+          echo '```json' >> $GITHUB_ENV
+          echo "$ARANGODB_TO_PYG_DIFF" | jq . >> $GITHUB_ENV
           echo '```' >> $GITHUB_ENV
           echo '</details>' >> $GITHUB_ENV
           echo 'EOF' >> $GITHUB_ENV
 
-
-      # - name: Prepare PR Message
-      #   run: |
-      #     echo "MESSAGE<<EOF" >> $GITHUB_ENV
-      #     echo '**Benchmark (${GITHUB_SHA})**' >> $GITHUB_ENV
-      #     echo '' >> $GITHUB_ENV
-      #     echo 'Root Span Comparisons:' >> $GITHUB_ENV
-      #     echo '```json' >> $GITHUB_ENV
-      #     cat $ROOT_SPAN_COMPARISON >> $GITHUB_ENV
-      #     echo '```' >> $GITHUB_ENV
-      #     echo '' >> $GITHUB_ENV
-      #     echo '<details><summary>PyG to ArangoDB Comparison</summary>' >> $GITHUB_ENV
-      #     echo '' >> $GITHUB_ENV
-      #     echo '```json' >> $GITHUB_ENV
-      #     cat $PYG_TO_ARANGODB_DIFF >> $GITHUB_ENV
-      #     echo '```' >> $GITHUB_ENV
-      #     echo '</details>' >> $GITHUB_ENV
-      #     echo '' >> $GITHUB_ENV
-      #     echo '<details><summary>ArangoDB to PyG Comparison</summary>' >> $GITHUB_ENV
-      #     echo '' >> $GITHUB_ENV
-      #     echo '```json' >> $GITHUB_ENV
-      #     cat $ARANGODB_TO_PYG_DIFF >> $GITHUB_ENV
-      #     echo '```' >> $GITHUB_ENV
-      #     echo '</details>' >> $GITHUB_ENV
-      #     echo "EOF" >> $GITHUB_ENV
-
       - name: Comment on PR
         uses: actions/github-script@v7
         with: