chore: ci fixes

electric-sql · Oct 21, 2024 · 3882e83 · 3882e83
1 parent 8808c00
commit 3882e83
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/.github/workflows/benchmarking.yml b/.github/workflows/benchmarking.yml
@@ -52,32 +52,32 @@ jobs:
         run: |
           docker pull ${{ env.REGISTRY }}/electric:canary-builder || true
           docker pull ${{ env.REGISTRY }}/electric:canary-runner-base || true
-          docker pull ${{ env.REGISTRY }}/electric:pr-${{ github.event.number }}-builder || true
-          docker pull ${{ env.REGISTRY }}/electric:pr-${{ github.event.number }}-runner-base || true
+          docker pull ${{ env.REGISTRY }}/electric:pr-${{ github.event.issue.number }}-builder || true
+          docker pull ${{ env.REGISTRY }}/electric:pr-${{ github.event.issue.number }}-runner-base || true
       - name: Build base images
         run: >
           docker build \
             --push \
             --cache-from ${{ env.REGISTRY }}/electric:canary-builder \
-            --cache-from ${{ env.REGISTRY }}/electric:pr-${{ github.event.number }}-builder \
-            --tag ${{ env.REGISTRY }}/electric:pr-${{ github.event.number }}-builder \
+            --cache-from ${{ env.REGISTRY }}/electric:pr-${{ github.event.issue.number }}-builder \
+            --tag ${{ env.REGISTRY }}/electric:pr-${{ github.event.issue.number }}-builder \
             --target builder \
             .
 
           docker build \
             --push \
             --cache-from ${{ env.REGISTRY }}/electric:canary-runner-base \
-            --cache-from ${{ env.REGISTRY }}/electric:pr-${{ github.event.number }}-runner-base \
-            --tag  ${{ env.REGISTRY }}/electric:pr-${{ github.event.number }}-runner-base \
+            --cache-from ${{ env.REGISTRY }}/electric:pr-${{ github.event.issue.number }}-runner-base \
+            --tag  ${{ env.REGISTRY }}/electric:pr-${{ github.event.issue.number }}-runner-base \
             --target runner_setup \
             .
       - name: Build actual image
         run: >
           docker build \
             --push \
-            --cache-from=${{ env.REGISTRY }}/electric:pr-${{ github.event.number }}-builder \
-            --cache-from=${{ env.REGISTRY }}/electric:pr-${{ github.event.number }}-runner-base \
-            --tag  ${{ env.REGISTRY }}/electric:pr-${{ github.event.number }}-${{ env.SHORT_SHA }} \
+            --cache-from=${{ env.REGISTRY }}/electric:pr-${{ github.event.issue.number }}-builder \
+            --cache-from=${{ env.REGISTRY }}/electric:pr-${{ github.event.issue.number }}-runner-base \
+            --tag  ${{ env.REGISTRY }}/electric:pr-${{ github.event.issue.number }}-${{ env.SHORT_SHA }} \
             .
       - name: Write fanout benchmark
         run: |
@@ -88,7 +88,7 @@ jobs:
             -d '{
               "benchmark_run": {
                 "spec_values": {
-                  "electric_image": ["${{ env.REGISTRY }}/electric:pr-${{ github.event.number }}-${{ env.SHORT_SHA }}"],
+                  "electric_image": ["${{ env.REGISTRY }}/electric:pr-${{ github.event.issue.number }}-${{ env.SHORT_SHA }}"],
                   "postgres_image": ["postgres:15-alpine"],
                   "row_count": [500],
                   "concurrent": [5, 105, 205, 305, 405, 505, 605, 705, 805, 905, 1005],
@@ -99,17 +99,17 @@ jobs:
                   "mem_gb": 8
                 },
                 "metadata": {
-                  "pr": ${{ github.event.number }},
-                  "short_version": "pr-${{ github.event.number }}-${{ env.SHORT_SHA }}"
+                  "pr": ${{ github.event.issue.number }},
+                  "short_version": "pr-${{ github.event.issue.number }}-${{ env.SHORT_SHA }}"
                   "callback": {
                     "method": "POST",
                     "headers": [
                       ["Accept","application/vnd.github+json"],
                       ["Authorization","Bearer ${{ secrets.CROSSREPO_PAT }}"],
-                      ["X-GitHub-Api-Version","2022-11-28"]]
+                      ["X-GitHub-Api-Version","2022-11-28"]
                     ],
                     "url":"https://api.github.com/repos/electric-sql/electric/actions/workflows/leave_benchmark_comment.yml/dispatches",
-                    "body": "{\"ref\":\"main\",\"inputs\":{\"pr\":\"${{ github.event.number }}\",\"benchmark_info\":#{benchmark_info},\"original_commit\":\"${{ env.SHORT_SHA }}\"}}"
+                    "body": "{\"ref\":\"main\",\"inputs\":{\"pr\":\"${{ github.event.issue.number }}\",\"benchmark_info\":#{benchmark_info},\"original_commit\":\"${{ env.SHORT_SHA }}\"}}"
                   }
                 }
               }