Skip to content
This repository was archived by the owner on Sep 27, 2023. It is now read-only.

Commit c87dfc2

Browse files
authored
Fix deployment issue by pulling before setting upstream (#145)
Fix deployment issue by pulling before setting upstream
2 parents 340aeec + 0a6a091 commit c87dfc2

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

.travis.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,12 @@ script:
1717
before_deploy:
1818
- echo "NPM_TOKEN=${NPM_TOKEN}" >> .env
1919
- echo "GH_TOKEN=${GH_TOKEN}" >> .env
20-
- git checkout master && git pull origin
20+
- git config --local user.name "${GIT_NAME}"
21+
- git config --local user.email "${GIT_EMAIL}"
22+
- git remote rm origin
23+
- git remote add origin https://${GH_USER}:${GH_TOKEN}@github.com/relay-tools/relay-compiler-language-typescript.git
24+
- git pull origin master
25+
- git branch --set-upstream-to origin/master
2126
- yarn build
2227
deploy:
2328
skip_cleanup: true

scripts/deploy.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
11
if [ ! -z "$TRAVIS_BRANCH" ] && [ "$TRAVIS_BRANCH" == "master" ]; then
2-
git config --local user.name "${GIT_NAME}"
3-
git config --local user.email "${GIT_EMAIL}"
4-
git remote rm origin
5-
git remote add origin https://${GH_USER}:${GH_TOKEN}@github.com/relay-tools/relay-compiler-language-typescript.git
6-
git branch --set-upstream-to origin/master
7-
82
npx auto shipit $AUTO_OPTS
93
else
104
echo "Not on master, skipping deploy"

0 commit comments

Comments
 (0)