Skip to content

Commit

Permalink
Fix regexp
Browse files Browse the repository at this point in the history
  • Loading branch information
bigorn0 committed Sep 20, 2023
1 parent d2afb9d commit a42f37f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/macos-intel-build-prebuilds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@ jobs:
name: modulesToBuildForElectron
# Openssl3 and krb5 are already installed on Github host Mac OS runners
- name: Install toolkit
run: npm install --no-optional
run: npm install --omit=optional
- name: Build native modules on Mac OS x64
run: npm run rebuild-custom-for-target
4 changes: 2 additions & 2 deletions rebuild.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ const modulesToBuild = modules
.map(module => {
// Base dir might have changed between runs
const oldBaseDir = module.baseDir;
const reg = new RegExp('.+/native-deps-buildkit/node_modules')
const fixedBaseDir = oldBaseDir.replace(reg, `${ROOT_DIR}/node_modules`)
const reg = new RegExp('.+/native-deps-buildkit/node_modules', 'gi')
const fixedBaseDir = oldBaseDir.replaceAll(reg, `${ROOT_DIR}/node_modules`)
log('--> using new baseDir: %o', fixedBaseDir);
module.module.baseDir = fixedBaseDir;
return module;
Expand Down

0 comments on commit a42f37f

Please sign in to comment.