-
Notifications
You must be signed in to change notification settings - Fork 325
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(libdweb/ci): network lock and submodule sync
- Loading branch information
Showing
2 changed files
with
5 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
import groovy.transform.Field | ||
// Global for which node version to use on macos and windows | ||
// When in doubt, should follow https://github.com/ipfs/jenkins-libs/blob/master/vars/javascript.groovy | ||
@Field final String nodeVersion = '8.11.3' | ||
@Field final String nodeVersion = '10.4.1' | ||
|
||
// Run targets in parallel | ||
parallel( | ||
|
@@ -64,7 +64,7 @@ parallel( | |
bat 'npx [email protected] config set msvs_version 2015 --global' | ||
// run developer build as a smoke-test for windows | ||
// bat 'npm run dev-build' | ||
bat 'npx [email protected]' | ||
bat 'npx [email protected] --mutex network --no-lockfile' | ||
bat 'npm run libdweb:build' | ||
bat 'dir /s /b /o:gn build' | ||
} | ||
|
@@ -94,7 +94,7 @@ parallel( | |
sh 'rm -rf node_modules/' | ||
// run developer build as a smoke-test | ||
// sh 'npm run dev-build' | ||
sh 'npx [email protected]' | ||
sh 'npx [email protected] --mutex network --no-lockfile' | ||
sh 'npm run libdweb:build' | ||
sh 'ls -Rlh build' | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -24,7 +24,7 @@ | |
"build:js": "run-p build:js:*", | ||
"build:js:webpack": "webpack -p", | ||
"build:minimize-dist": "shx rm -rf add-on/dist/lib add-on/dist/contentScripts/ add-on/dist/bundles/ipfsProxyContentScriptPayload.bundle.js", | ||
"build:bundle-all": "RELEASE_CHANNEL=${RELEASE_CHANNEL:=dev} npm run bundle:generic && cross-env-shell npm run bundle:firefox:$RELEASE_CHANNEL", | ||
"build:bundle-all": "cross-env-shell RELEASE_CHANNEL=${RELEASE_CHANNEL:=dev} npm run bundle:generic && cross-env-shell npm run bundle:firefox:$RELEASE_CHANNEL", | ||
"bundle": "run-s bundle:*", | ||
"bundle:generic": "shx cp add-on/manifest.common.json add-on/manifest.json && web-ext build -a build/generic", | ||
"bundle:firefox": "shx cat add-on/manifest.common.json add-on/manifest.firefox.json | json --deep-merge > add-on/manifest.json && web-ext build -a build/firefox/", | ||
|
@@ -46,7 +46,7 @@ | |
"prepush": "run-s clean build lint test", | ||
"firefox": "web-ext run --browser-console --url about:debugging", | ||
"libdweb": "npx [email protected] && npm run libdweb:build && npm run libdweb:firefox", | ||
"libdweb:build": "git submodule update --init --checkout --depth 1 libdweb && cross-env-shell RELEASE_CHANNEL=libdweb npm run dev-build", | ||
"libdweb:build": "git submodule sync && git submodule init && git submodule update && cross-env-shell RELEASE_CHANNEL=libdweb npm run dev-build", | ||
"libdweb:firefox": "npm run get-firefox-nightly && cross-env MOZ_DISABLE_CONTENT_SANDBOX=1 web-ext run --firefox=./firefox/firefox --browser-console --url about:debugging", | ||
"get-firefox-nightly": "shx test -e ./firefox/firefox || get-firefox -b nightly -e", | ||
"ci": "run-s ci:*", | ||
|