From f8a37c41a0feb276301c74bc728f305563c059a7 Mon Sep 17 00:00:00 2001
From: Alex Moinet <alex@bugsnag.com>
Date: Tue, 20 Aug 2024 09:41:13 +0100
Subject: [PATCH] Pipeline debugging

---
 .buildkite/basic/electron-pipeline.yml | 99 ++++++++++++++------------
 1 file changed, 54 insertions(+), 45 deletions(-)

diff --git a/.buildkite/basic/electron-pipeline.yml b/.buildkite/basic/electron-pipeline.yml
index 0c5582394..ef1d27fe4 100644
--- a/.buildkite/basic/electron-pipeline.yml
+++ b/.buildkite/basic/electron-pipeline.yml
@@ -30,7 +30,7 @@ steps:
   # Ubuntu tests Node 18
   #
   - label: "Build Electron {{matrix.electron_version}} docker test image"
-    key: "electron-image-build"
+    key: "electron-image-build-{{matrix.electron_version}}"
     timeout_in_minutes: 10
     env:
       ELECTRON_VERSION: "{{matrix.electron_version}}"
@@ -46,15 +46,15 @@ steps:
       - docker-compose#v4.12.0:
           build:
             - electron-test-image
-          # image-repository: 855461928731.dkr.ecr.us-west-1.amazonaws.com/js
-          # cache-from:
-          #   - electron-test-image:855461928731.dkr.ecr.us-west-1.amazonaws.com/js:ci-electron-test-${BRANCH_NAME}-${matrix.electron_version}
-      # - docker-compose#v4.12.0:
-      #     push:
-      #       - electron-ubuntu-test:855461928731.dkr.ecr.us-west-1.amazonaws.com/js:ci-electron-test-${BRANCH_NAME}-${matrix.electron_version}
+          image-repository: 855461928731.dkr.ecr.us-west-1.amazonaws.com/js
+          cache-from:
+            - electron-test-image:855461928731.dkr.ecr.us-west-1.amazonaws.com/js:ci-electron-test-${matrix.electron_version}
+      - docker-compose#v4.12.0:
+          push:
+            - electron-ubuntu-test:855461928731.dkr.ecr.us-west-1.amazonaws.com/js:ci-electron-test-${matrix.electron_version}
 
   - label: "Electron {{matrix.electron_version}} linting"
-    depends_on: "electron-image-build"
+    depends_on: "electron-image-build-{{matrix.electron_version}}"
     timeout_in_minutes: 10
     env:
       ELECTRON_VERSION: "{{matrix.electron_version}}"
@@ -69,42 +69,51 @@ steps:
     plugins:
       - docker-compose#v4.12.0:
           run: electron-test-image
-          command: "npm run test:lint-native"
+          command:
+            - npm
+            - run
+            - test:lint-native
 
-  # - label: "Electron {{matrix.electron_version}} unit tests"
-  #   depends_on: "electron-image-build"
-  #   timeout_in_minutes: 10
-  #   env:
-  #     ELECTRON_VERSION: "{{matrix.electron_version}}"
-  #   matrix:
-  #     setup:
-  #       electron_version:
-  #         - "^20.0.0"
-  #         - "^24.0.0"
-  #         - "^26.0.0"
-  #         - "^28.0.0"
-  #         - "^30.0.0"
-  #   plugins:
-  #     - docker-compose#v4.12.0:
-  #         run: electron-test-image
-  #         command: npm run test:unit:electron-runner
+  - label: "Electron {{matrix.electron_version}} unit tests"
+    depends_on: "electron-image-build-{{matrix.electron_version}}"
+    timeout_in_minutes: 10
+    env:
+      ELECTRON_VERSION: "{{matrix.electron_version}}"
+    matrix:
+      setup:
+        electron_version:
+          - "^20.0.0"
+          - "^24.0.0"
+          - "^26.0.0"
+          - "^28.0.0"
+          - "^30.0.0"
+    plugins:
+      - docker-compose#v4.12.0:
+          run: electron-test-image
+          command:
+            - npm
+            - run
+            - test:unit:electron-runner
 
-  # - label: "Electron {{matrix.electron_version}} integration tests"
-  #   depends_on: "electron-image-build"
-  #   timeout_in_minutes: 10
-  #   env:
-  #     ELECTRON_VERSION: "{{matrix.electron_version}}"
-  #   matrix:
-  #     setup:
-  #       electron_version:
-  #         - "^20.0.0"
-  #         - "^24.0.0"
-  #         - "^26.0.0"
-  #         - "^28.0.0"
-  #         - "^30.0.0"
-  #   plugins:
-  #     - docker-compose#v4.12.0:
-  #         run: electron-test-image
-  #         command: npm run test:electron
-  #   artifact_paths:
-  #       - "test/electron/maze_output/**/*"
+  - label: "Electron {{matrix.electron_version}} integration tests"
+    depends_on: "electron-image-build-{{matrix.electron_version}}"
+    timeout_in_minutes: 10
+    env:
+      ELECTRON_VERSION: "{{matrix.electron_version}}"
+    matrix:
+      setup:
+        electron_version:
+          - "^20.0.0"
+          - "^24.0.0"
+          - "^26.0.0"
+          - "^28.0.0"
+          - "^30.0.0"
+    plugins:
+      - docker-compose#v4.12.0:
+          run: electron-test-image
+          command:
+            - npm
+            - run
+            - test:electron
+    artifact_paths:
+        - "test/electron/maze_output/**/*"