Skip to content

Commit

Permalink
fix(libdweb/ci): switch to dev yarn build
Browse files Browse the repository at this point in the history
  • Loading branch information
lidel committed Aug 3, 2018
1 parent 1d18fc5 commit 3133ad0
Show file tree
Hide file tree
Showing 3 changed files with 132 additions and 74 deletions.
7 changes: 4 additions & 3 deletions ci/Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import groovy.transform.Field
// Global for which node version to use on macos and windows
@Field final String nodeVersion = '9.2.0'
// When in doubt, should follow https://github.com/ipfs/jenkins-libs/blob/master/vars/javascript.groovy
@Field final String nodeVersion = '8.11.3'

// Run targets in parallel
parallel(
Expand Down Expand Up @@ -63,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 'npm run ci:install'
bat 'npx yarn@1.7.0'
bat 'npm run libdweb:build'
bat 'dir /s /b /o:gn build'
}
Expand Down Expand Up @@ -93,7 +94,7 @@ parallel(
sh 'rm -rf node_modules/'
// run developer build as a smoke-test
// sh 'npm run dev-build'
sh 'npm run ci:install'
sh 'npx yarn@1.7.0'
sh 'npm run libdweb:build'
sh 'ls -Rlh build'
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"precommit": "run-s lint:standard",
"prepush": "run-s clean build lint test",
"firefox": "web-ext run --browser-console --url about:debugging",
"libdweb": "npm run ci:install && npm run libdweb:build && npm run libdweb:firefox",
"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: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",
Expand Down
Loading

0 comments on commit 3133ad0

Please sign in to comment.