Skip to content

Commit

Permalink
fix(libdweb/ci): network lock and submodule sync
Browse files Browse the repository at this point in the history
  • Loading branch information
lidel committed Aug 3, 2018
1 parent 3133ad0 commit 89543d1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions ci/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ parallel(
bat 'npx yarn@1.7.0 config set msvs_version 2015 --global'
// run developer build as a smoke-test for windows
// bat 'npm run dev-build'
bat 'npx yarn@1.7.0'
bat 'npx yarn@1.7.0 --mutex network --no-lockfile'
bat 'npm run libdweb:build'
bat 'dir /s /b /o:gn build'
}
Expand Down Expand Up @@ -94,7 +94,7 @@ parallel(
sh 'rm -rf node_modules/'
// run developer build as a smoke-test
// sh 'npm run dev-build'
sh 'npx yarn@1.7.0'
sh 'npx yarn@1.7.0 --mutex network --no-lockfile'
sh 'npm run libdweb:build'
sh 'ls -Rlh build'
}
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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/",
Expand All @@ -46,7 +46,7 @@
"prepush": "run-s clean build lint test",
"firefox": "web-ext run --browser-console --url about:debugging",
"libdweb": "npx yarn@1.7.0 && 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:*",
Expand Down

0 comments on commit 89543d1

Please sign in to comment.