Skip to content

Commit

Permalink
Merge branch 'master' into DetoxNext
Browse files Browse the repository at this point in the history
# Conflicts:
#	detox-cli/package.json
#	detox/package.json
#	detox/test/package.json
#	examples/demo-native-android/package.json
#	examples/demo-native-ios/package.json
#	examples/demo-plugin/package.json
#	examples/demo-react-native-detox-instruments/package.json
#	examples/demo-react-native-jest/package.json
#	examples/demo-react-native/package.json
#	generation/package.json
#	lerna.json
#	package.json
  • Loading branch information
rotemmiz committed Nov 4, 2020
2 parents 54ff0f1 + 8fe90ed commit 0fbd78c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion scripts/ci.release.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ function setupGitConfig() {
exec.execSyncSilent(`git config --global user.email "${process.env.GIT_EMAIL}"`);
exec.execSyncSilent(`git config --global user.name "${process.env.GIT_USER}"`);
const remoteUrl = new RegExp(`https?://(\\S+)`).exec(exec.execSyncRead(`git remote -v`))[1];
exec.execSyncSilent(`git remote add deploy "https://${process.env.GIT_USER}:${process.env.GIT_TOKEN}@${remoteUrl}"`);
exec.execSyncSilent(`git remote set-url origin "https://${process.env.GIT_USER}:${process.env.GIT_TOKEN}@${remoteUrl}"`);
}

function setupNpmConfig() {
Expand Down

0 comments on commit 0fbd78c

Please sign in to comment.