Fix macos-notification-state build issue (#2310)

* Fix macos-notification-state build issue * Fix windows build, a bit of cleanup
mattermost · Oct 24, 2022 · 83b6c64 · 83b6c64
1 parent 33da0af
commit 83b6c64
Show file tree

Hide file tree

Showing 7 changed files with 1,861 additions and 50 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -191,7 +191,7 @@ jobs:
       - run:
           name: Install nodejs-lts
           command: nvm off; choco install nodejs-lts -y
-      - run: npm i -g node-gyp; node-gyp install
+      - run: npm i -g node-gyp; node-gyp install; node-gyp install --devdir="$env:USERPROFILE\.electron-gyp" --target=$(jq -r .devDependencies.electron package.json) --dist-url="https://electronjs.org/headers"
       - run: $env:PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = 1; npm ci
       - build:
           os: windows
@@ -269,7 +269,7 @@ jobs:
       - run:
           name: Install nodejs-lts
           command: nvm off; choco install nodejs-lts -y
-      - run: npm i -g node-gyp; node-gyp install
+      - run: npm i -g node-gyp; node-gyp install; node-gyp install --devdir="$env:USERPROFILE\.electron-gyp" --target=$(jq -r .devDependencies.electron package.json) --dist-url="https://electronjs.org/headers"
       - run: $env:PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = 1; npm ci
       - build:
           os: windows

diff --git a/electron-builder.json b/electron-builder.json
@@ -32,7 +32,6 @@
       ]
     }
   ],
-  "beforePack": "scripts/beforepack.js",
   "afterPack": "scripts/afterpack.js",
   "afterSign": "scripts/notarize.js",
   "afterAllArtifactBuild": "scripts/afterbuild.js",