Reorder signing to see if the issue is ffmpeg or all packages

cypress-io · Nov 19, 2021 · d66c467 · d66c467 · cypress-bot · Nov 19, 2021
1 parent a32e015
commit d66c467
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/electron-builder.json b/electron-builder.json
@@ -11,14 +11,14 @@
     "entitlementsInherit": "./scripts/entitlements.mac.inherit.plist",
     "type": "distribution",
     "binaries": [
-      "./build/mac/Cypress.app/Contents/Resources/app/node_modules/@ffmpeg-installer/darwin-x64/ffmpeg",
+      "./build/mac/Cypress.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Helpers/chrome_crashpad_handler",
+      "./build/mac/Cypress.app/Contents/Resources/app/node_modules/fsevents/fsevents.node",
+      "./build/mac/Cypress.app/Contents/Resources/app/node_modules/trash/lib/macos-trash",
       "./build/mac/Cypress.app/Contents/Resources/app/node_modules/watchpack-chokidar2/node_modules/fsevents/build/Release/.node",
       "./build/mac/Cypress.app/Contents/Resources/app/node_modules/watchpack-chokidar2/node_modules/fsevents/build/Release/fse.node",
       "./build/mac/Cypress.app/Contents/Resources/app/node_modules/registry-js/build/Release/registry.node",
       "./build/mac/Cypress.app/Contents/Resources/app/node_modules/term-size/vendor/macos/term-size",
-      "./build/mac/Cypress.app/Contents/Resources/app/node_modules/trash/lib/macos-trash",
-      "./build/mac/Cypress.app/Contents/Resources/app/node_modules/fsevents/fsevents.node",
-      "./build/mac/Cypress.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Helpers/chrome_crashpad_handler"
+      "./build/mac/Cypress.app/Contents/Resources/app/node_modules/@ffmpeg-installer/darwin-x64/ffmpeg"
     ]
   },
   "linux": {

diff --git a/scripts/binary/util/packages.ts b/scripts/binary/util/packages.ts
@@ -58,7 +58,15 @@ export async function copyAllToDist (distDir: string) {
     // copies the package to dist
     // including the default paths
     // and any specified in package.json files
-    const json = await fs.readJSON(pathToPackageJson(pkg))
+    let json
+
+    try {
+      json = await fs.readJSON(pathToPackageJson(pkg))
+    } catch (e) {
+      if (e.code === 'ENOENT') {
+        continue
+      }
+    }
 
     // grab all the files that match "files" wildcards
     // but without all negated files ("!src/**/*.spec.js" for example)

diff --git a/yarn.lock b/yarn.lock
@@ -41726,4 +41726,4 @@ zone.js@~0.10.3:
 zwitch@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-1.0.5.tgz#d11d7381ffed16b742f6af7b3f223d5cd9fe9920"
-  integrity sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==
+  integrity sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==