[CI] Fix deploy condition
This commit is contained in:
parent
d0f860f7c7
commit
70cfe750d5
18
.travis.yml
18
.travis.yml
|
@ -17,13 +17,7 @@ env:
|
|||
before_script:
|
||||
- docker pull jare/spacetools:latest
|
||||
script:
|
||||
- git checkout "${TRAVIS_BRANCH}"
|
||||
before_deploy:
|
||||
- >
|
||||
if ! [ "$BEFORE_DEPLOY_RUN" ]; then
|
||||
export BEFORE_DEPLOY_RUN=1;
|
||||
.travisci/pub_prep.sh
|
||||
fi
|
||||
- git checkout "${TRAVIS_BRANCH}" && .travisci/pub_prep.sh
|
||||
deploy:
|
||||
- provider: script
|
||||
skip_cleanup: true
|
||||
|
@ -32,8 +26,9 @@ deploy:
|
|||
branch: develop
|
||||
# Deploy only if we are in the official repo and
|
||||
# the local revision matches origin's head
|
||||
condition: $TRAVIS_REPO_SLUG = $SPACEMACS_REPO_SLUG && \
|
||||
$(git remote update) && \
|
||||
condition: |
|
||||
$TRAVIS_REPO_SLUG = $SPACEMACS_REPO_SLUG AND \
|
||||
$(git remote update) AND \
|
||||
$(git rev-parse '@') = $(git rev-parse '@{u}')
|
||||
- provider: script
|
||||
skip_cleanup: true
|
||||
|
@ -42,6 +37,7 @@ deploy:
|
|||
all_branches: true
|
||||
# Deploy only if we are in the official repo and
|
||||
# the local revision matches origin's head
|
||||
condition: $TRAVIS_REPO_SLUG = $SPACEMACS_REPO_SLUG && \
|
||||
$(git remote update) && \
|
||||
condition: |
|
||||
$TRAVIS_REPO_SLUG = $SPACEMACS_REPO_SLUG AND \
|
||||
$(git remote update) AND \
|
||||
$(git rev-parse '@') = $(git rev-parse '@{u}')
|
||||
|
|
Loading…
Reference in a new issue