Skip to content

Commit f9e65fd

Browse files
committed
use test command
1 parent 966d644 commit f9e65fd

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

.travis.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,17 @@ matrix:
1616
script:
1717
- yarn lint
1818
after_success:
19-
# docker on master branch
20-
- if [[ ("$TRAVIS_BRANCH" == "master") && ("$TRAVIS_PULL_REQUEST" == "true") ]]; then
21-
docker login -u "$DOCKER_USER" -p "$DOCKER_PASS";
19+
test $TRAVIS_BRANCH = "master" && test $TRAVIS_PULL_REQUEST = "true" &&
20+
( docker login -u "$DOCKER_USER" -p "$DOCKER_PASS";
2221
export REPO="democracy/democracy-server";
2322
docker build -f Dockerfile -t $REPO:$COMMIT .;
24-
docker push $REPO;
25-
fi
23+
docker push $REPO;)
24+
# docker on master branch
25+
#- if [[ ("$TRAVIS_BRANCH" == "master") && ("$TRAVIS_PULL_REQUEST" == "true") ]]; then
26+
# docker login -u "$DOCKER_USER" -p "$DOCKER_PASS";
27+
# export REPO="democracy/democracy-server";
28+
# docker build -f Dockerfile -t $REPO:$COMMIT .;
29+
# docker push $REPO;
30+
# fi
2631
after_script:
2732
- echo "BUILD FINISHED"

0 commit comments

Comments
 (0)