Skip to content

Commit

Permalink
Merge pull request #6 from cytopia/release-0.2
Browse files Browse the repository at this point in the history
Fix Docker image tags
  • Loading branch information
cytopia authored Jun 18, 2019
2 parents c041e2d + a466d30 commit ef00e10
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 13 deletions.
18 changes: 5 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,6 @@ services:
- docker


###
### Build Matrix
###
env:
matrix:
- VERSION=latest


###
### Install requirements
###
Expand All @@ -41,8 +33,8 @@ install:
### Check generation changes, build and test
###
before_script:
- while ! make build TAG=${VERSION}; do sleep 1; done
- while ! make test TAG=${VERSION}; do sleep 1; done
- while ! make build; do sleep 1; done
- while ! make test; do sleep 1; done


###
Expand All @@ -53,11 +45,11 @@ script:
- if [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then
while ! make login USER="${DOCKER_USERNAME}" PASS="${DOCKER_PASSWORD}"; do sleep 1; done;
if [ -n "${TRAVIS_TAG}" ]; then
while ! make push TAG="${VERSION}-${TRAVIS_TAG}"; do sleep 1; done;
while ! make push TAG="${TRAVIS_TAG}"; do sleep 1; done;
elif [ "${TRAVIS_BRANCH}" == "master" ]; then
while ! make push TAG=${VERSION}; do sleep 1; done;
while ! make push; do sleep 1; done;
elif [[ ${TRAVIS_BRANCH} =~ ^(release-[.0-9]+)$ ]]; then
while ! make push TAG="${VERSION}-${TRAVIS_BRANCH}"; do sleep 1; done;
while ! make push TAG="${TRAVIS_BRANCH}"; do sleep 1; done;
else
echo "Skipping branch ${TRAVIS_BRANCH}";
fi
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ Tiny Alpine-based Docker image for the very basics of CI against your code files
| Docker tag | Build from |
|------------|------------|
| `latest` | Current stable file-lint version |
| `<tag>` | Git tag from this repository |


## Docker mounts
Expand Down

0 comments on commit ef00e10

Please sign in to comment.