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