fix: GitHub Actions Yarn Electron force version resolution

daisy · Sep 18, 2024 · c781689 · c781689
1 parent 4729086
commit c781689
Show file tree

Hide file tree

Showing 3 changed files with 1,309 additions and 1,516 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -74,7 +74,7 @@ jobs:
       shell: bash
     - name: non-PR action, Windows, YARN INSTALL
       if: ${{ github.event_name != 'pull_request' && ( matrix.osarch == 'windows-intel' || matrix.osarch == 'windows-arm' ) }}
-      run: echo "${{ matrix.osarch }}" && yarn install --network-timeout 1000000 || (dir C:\Users\runneradmin\AppData\Local\electron\Cache\ && dir C:\Users\runneradmin\AppData\Local\electron\Cache\763e1ded5bfc6f3862bfcc801d7ca46745b5e20a39e4263b4dbb680e7c92f0ad && dir C:\Users\runneradmin\AppData\Local\electron\Cache\70829cbb4e1572da61893254d04a0c0c66e78deccc85ea1b8d262f6689158c77)
+      run: echo "${{ matrix.osarch }}" && yarn install --network-timeout 1000000 # || (dir C:\Users\runneradmin\AppData\Local\electron\Cache\ && dir C:\Users\runneradmin\AppData\Local\electron\Cache\763e1ded5bfc6f3862bfcc801d7ca46745b5e20a39e4263b4dbb680e7c92f0ad && dir C:\Users\runneradmin\AppData\Local\electron\Cache\70829cbb4e1572da61893254d04a0c0c66e78deccc85ea1b8d262f6689158c77)
       shell: cmd
     - name: non-PR action, Windows, ELECTRON CHECK
       if: ${{ github.event_name != 'pull_request' && ( matrix.osarch == 'windows-intel' || matrix.osarch == 'windows-arm' ) }}

diff --git a/package.json b/package.json
@@ -34,6 +34,9 @@
     "rimraf": "^3.0.2",
     "strip-ansi": "^6.0.0"
   },
+  "resolutions": {
+    "electron": "^32.1.1"
+  },
   "scripts": {
     "axe-dev": "cpy \"../axe-core_DAISY/axe.js\" \"node_modules/@daisy/axe-core-for-ace/\" && cpy \"../axe-core_DAISY/axe.min.js\" \"node_modules/@daisy/axe-core-for-ace/\" && cpy \"../axe-core_DAISY/axe.d.ts\" \"node_modules/@daisy/axe-core-for-ace/\" && cpy \"../axe-core_DAISY/locales/*.*\" \"node_modules/@daisy/axe-core-for-ace/locales/\" && cpy \"../axe-core_DAISY/package.json\" \"node_modules/@daisy/axe-core-for-ace/\"",
     "ace": "node ./packages/ace-cli/bin/ace.js",