diff --git a/.circleci/config.yml b/.circleci/config.yml index 19ea9286..3be263e7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -191,8 +191,8 @@ jobs: - run: name: Install nodejs-lts command: choco install nodejs-lts -y - # ignoring scripts for windows due to issues with node-gyp - - run: $env:PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = 1; npm ci --ignore-scripts + - run: npm i -g node-gyp; node-gyp install + - run: $env:PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = 1; npm ci - build: os: windows path: ./build/win @@ -269,7 +269,8 @@ jobs: - run: name: Install nodejs-lts command: choco install nodejs-lts -y - - run: $env:PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = 1; npm ci --ignore-scripts + - run: npm i -g node-gyp; node-gyp install + - run: $env:PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = 1; npm ci - build: os: windows path: ./build/win diff --git a/package-lock.json b/package-lock.json index f11122b0..15191980 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,6 @@ "mmjstool": "github:mattermost/mattermost-utilities#3b4506b0f6b14fbb402f9f8ef932370e459e3773", "mocha-circleci-reporter": "0.0.3", "mochawesome": "7.1.3", - "node-gyp": "9.0.0", "node-loader": "2.0.0", "npm-run-all": "4.1.5", "playwright": "1.23.4", diff --git a/package.json b/package.json index 7991ecf2..0cb38234 100644 --- a/package.json +++ b/package.json @@ -172,7 +172,6 @@ "mmjstool": "github:mattermost/mattermost-utilities#3b4506b0f6b14fbb402f9f8ef932370e459e3773", "mocha-circleci-reporter": "0.0.3", "mochawesome": "7.1.3", - "node-gyp": "9.0.0", "node-loader": "2.0.0", "npm-run-all": "4.1.5", "playwright": "1.23.4", diff --git a/scripts/Makefile.ps1 b/scripts/Makefile.ps1 index 0bda0be6..faf1245d 100644 --- a/scripts/Makefile.ps1 +++ b/scripts/Makefile.ps1 @@ -525,7 +525,9 @@ function Run-BuildChangelog { function Run-BuildElectron { Print-Info "Installing nodejs/electron dependencies (running npm ci)..." - npm ci --ignore-scripts + npm i -g node-gyp + node-gyp install + npm ci #npm install --prefix="$(Get-RootDir)" "$(Get-RootDir)" Print-Info "Building nodejs/electron code (running npm run build)..." npm run build