Skip to content

Commit

Permalink
Merge pull request #8 from data61/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
wangzhen263 authored Mar 8, 2018
2 parents 75ab33d + aee50c4 commit 9d40265
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
9 changes: 2 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ env:
- ER_VERSION: $(mvn -q -Dexec.executable="echo" -Dexec.args='${project.version}'
--non-recursive org.codehaus.mojo:exec-maven-plugin:1.6.0:exec)
- ER_RC_VERSION: stellar-erbaseline:${ER_VERSION}-snapshot
- ER_RC_LATEST: stellar-erbaseline:latest-snapshot
- ER_LATEST: stellar-erbaseline:latest
- ER_VERSION: stellar-erbaseline:${ER_VERSION}
before_install:
Expand All @@ -20,23 +19,19 @@ jobs:
script:
- mvn package
- echo "Creating development docker for ERBaseline version [${ER_VERSION}]"
- docker build -f docker/Dockerfile -t ${DOCKER_USER}/${ER_RC_LATEST}d .
- docker tag ${DOCKER_USER}/${ER_RC_LATEST}d ${DOCKER_USER}/${ER_RC_VERSION}d
- docker build -f docker/Dockerfile -t ${DOCKER_USER}/${ER_RC_VERSION}d .
- echo "Release a development build."
- docker login -u "${DOCKER_USER}" -p "${DOCKER_PASS}"
- docker push ${DOCKER_USER}/${ER_RC_VERSION}d
- docker push ${DOCKER_USER}/${ER_RC_LATEST}d
- stage: staging
if: branch = master
script:
- mvn package
- echo "Creating stage docker for ERBaseline version [${ER_VERSION}]"
- docker build -f docker/Dockerfile -t data61/${ER_RC_LATEST} .
- docker tag data61/${ER_RC_LATEST} data61/${ER_RC_VERSION}
- docker build -f docker/Dockerfile -t data61/${ER_RC_VERSION} .
- echo "Release a stage build."
- docker login -u "${DOCKER_USER}" -p "${DOCKER_PASS}"
- docker push data61/${ER_RC_VERSION}
- docker push data61/${ER_RC_LATEST}
- stage: release
if: tag =~ ^release-.*$
script:
Expand Down
6 changes: 5 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@
<id>Serene-snapshot</id>
<url>s3://serene-maven-repository/snapshots</url>
</repository>
<repository>
<id>Serene-release</id>
<url>s3://serene-maven-repository/releases</url>
</repository>
</repositories>

<dependencies>
Expand Down Expand Up @@ -50,7 +54,7 @@
<dependency>
<groupId>sh.serene</groupId>
<artifactId>stellar-utils</artifactId>
<version>0.2.0-SNAPSHOT</version>
<version>0.2.0</version>
</dependency>

<dependency>
Expand Down

0 comments on commit 9d40265

Please sign in to comment.