Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-02-26 00:54:04 +08:00
Code Issues Projects Releases Packages Wiki Activity

Revert to Node 6.9+, Linux build failing with npm 4

Browse source
This commit is contained in:
Ben Gotow 2017-08-10 23:20:34 -07:00
parent 160812900b
commit b83a7fd426
2 changed files with 20 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.travis.yml
View file

@ -3,7 +3,7 @@ sudo: false
language: node_js language: node_js
node_js: node_js:
- '7.10' - '6.9'
addons: addons:
artifacts: true artifacts: true
@ -49,12 +49,12 @@ script:
addons: addons:
artifacts: artifacts:
working_dir: app/dist working_dir: app/dist
target_paths: builds/${TRAVIS_COMMIT:0:8}/${TRAVIS_OS_NAME} target_paths: client/${TRAVIS_COMMIT:0:8}/${TRAVIS_OS_NAME}
paths: paths:
- Merani.dmg - Merani.dmg
- Merani.zip - Merani.zip
- "*.rpm" - $(ls . | grep ".deb")
- "*.deb" - $(ls . | grep ".rpm")
cache: cache:
directories: directories:

36
scripts/postinstall.js
View file

@ -34,26 +34,22 @@ function npm(cmd, options) {
}); });
} }
async function go() { // For speed, we cache app/node_modules. However, we need to
// For speed, we cache app/node_modules. However, we need to // be sure to do a full rebuild of native node modules when the
// be sure to do a full rebuild of native node modules when the // Electron version changes. To do this we check a marker file.
// Electron version changes. To do this we check a marker file. const cacheVersionPath = './app/node_modules/.postinstall-target-version';
const cacheVersionPath = './app/node_modules/.postinstall-target-version'; const cacheElectronTarget = fs.existsSync(cacheVersionPath) && fs.readFileSync(cacheVersionPath).toString();
const cacheElectronTarget = fs.existsSync(cacheVersionPath) && fs.readFileSync(cacheVersionPath).toString();
if (cacheElectronTarget !== npmElectronTarget) { if (cacheElectronTarget !== npmElectronTarget) {
console.log(`\n-- Clearing app/node_modules --`) console.log(`\n-- Clearing app/node_modules --`)
rimraf.sync(path.resolve(__dirname, '..', 'app', 'node_modules')); rimraf.sync(path.resolve(__dirname, '..', 'app', 'node_modules'));
}
// run `npm install` in ./app with Electron NPM config
await npm('install', {cwd: './app', env: 'electron'});
// run `npm dedupe` in ./app with Electron NPM config
await npm('dedupe', {cwd: './app', env: 'electron'});
// write the marker with the electron version
fs.writeFileSync(cacheVersionPath, npmElectronTarget);
} }
go(); // run `npm install` in ./app with Electron NPM config
npm('install', {cwd: './app', env: 'electron'}).then(() =>
// run `npm dedupe` in ./app with Electron NPM config
npm('dedupe', {cwd: './app', env: 'electron'}).then(() =>
// write the marker with the electron version
fs.writeFileSync(cacheVersionPath, npmElectronTarget)
)
)