ci: test up to Electron 25 (#157)

* ci: test up to Electron 25 * ci: use matrix to simplify config * ci: fix config syntax * ci: change parameter type * chore: make TS happy
electron · Jul 11, 2023 · 07ca4ce · 07ca4ce
1 parent ccda605
commit 07ca4ce
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 86 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -31,103 +31,41 @@ jobs:
       EXTRA_ELECTRON_FLAGS: --in-process-gpu
     <<: *steps-test
 
-  test-electron-13:
+  test-electron:
     docker:
       - image: cimg/node:18.12.1-browsers
     environment:
-      ELECTRON_VERSION: 13.x
-    <<: *steps-test
-
-  test-electron-14:
-    docker:
-      - image: cimg/node:18.12.1-browsers
-    environment:
-      ELECTRON_VERSION: 14.x
-    <<: *steps-test
-
-  test-electron-15:
-    docker:
-      - image: cimg/node:18.12.1-browsers
-    environment:
-      ELECTRON_VERSION: 15.x
-    <<: *steps-test
-
-  test-electron-16:
-    docker:
-      - image: cimg/node:18.12.1-browsers
-    environment:
-      ELECTRON_VERSION: 16.x
-    <<: *steps-test
-
-  test-electron-17:
-    docker:
-      - image: cimg/node:18.12.1-browsers
-    environment:
-      ELECTRON_VERSION: 17.x
-    <<: *steps-test
-
-  test-electron-18:
-    docker:
-      - image: cimg/node:18.12.1-browsers
-    environment:
-      ELECTRON_VERSION: 18.x
-    <<: *steps-test
-
-  test-electron-19:
-    docker:
-      - image: cimg/node:18.12.1-browsers
-    environment:
-      ELECTRON_VERSION: 19.x
-    <<: *steps-test
-
-  test-electron-20:
-    docker:
-      - image: cimg/node:18.12.1-browsers
-    environment:
-      ELECTRON_VERSION: 20.x
-    <<: *steps-test
-
-  test-electron-21:
-    docker:
-      - image: cimg/node:18.12.1-browsers
-    environment:
-      ELECTRON_VERSION: 21.x
-    <<: *steps-test
-
-  test-electron-22:
-    docker:
-      - image: cimg/node:18.12.1-browsers
-    environment:
-      ELECTRON_VERSION: 22.x
+      ELECTRON_VERSION: << parameters.electron-version >>.x
+    parameters:
+      electron-version:
+        type: integer
     <<: *steps-test
 
 workflows:
   test_and_release:
     jobs:
       - test-electron-12
-      - test-electron-13
-      - test-electron-14
-      - test-electron-15
-      - test-electron-16
-      - test-electron-17
-      - test-electron-18
-      - test-electron-19
-      - test-electron-20
-      - test-electron-21
-      - test-electron-22
+      - test-electron:
+          matrix:
+            parameters:
+              electron-version:
+                - 13
+                - 14
+                - 15
+                - 16
+                - 17
+                - 18
+                - 19
+                - 20
+                - 21
+                - 22
+                - 23
+                - 24
+                - 25
       - cfa/release:
           requires:
             - test-electron-12
-            - test-electron-13
-            - test-electron-14
-            - test-electron-15
-            - test-electron-16
-            - test-electron-17
-            - test-electron-18
-            - test-electron-19
-            - test-electron-20
-            - test-electron-21
-            - test-electron-22
+            - test-electron
           filters:
             branches:
               only:

diff --git a/test/all.ts b/test/all.ts
@@ -377,7 +377,7 @@ describe('remote module', () => {
     })
 
     it('can serialize an empty nativeImage from main to renderer', async () => {
-      w().webContents.once('remote-get-global' as any, (event) => {
+      w().webContents.once('remote-get-global' as any, (event: any) => {
         const emptyImage = require('electron').nativeImage.createEmpty()
         event.returnValue = emptyImage
       })