Skip to content
This repository was archived by the owner on Mar 11, 2019. It is now read-only.

Commit dcfa631

Browse files
committed
fix(Travis CI): Fix Travis CI Docker images push for releases, use of official InfluxDB container instead of installing it from packages, add version number for binary releases.
1 parent 9be1f24 commit dcfa631

File tree

1 file changed

+14
-15
lines changed

1 file changed

+14
-15
lines changed

.travis.yml

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,39 +37,38 @@ script:
3737
before_install:
3838
- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then openssl aes-256-cbc -K $encrypted_48ebb0d1c0b9_key -iv $encrypted_48ebb0d1c0b9_iv -in secrets.tar.enc -out secrets.tar -d; fi
3939
- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then tar xvf secrets.tar; fi
40-
- wget -O influxdb.deb https://s3.amazonaws.com/influxdb/influxdb_0.10.2-1_amd64.deb
41-
- sudo dpkg -i influxdb.deb
42-
- sudo service influxdb start
43-
- sleep 5; /usr/bin/influx --execute "CREATE USER powerapi WITH PASSWORD 'powerapi' WITH ALL PRIVILEGES"
40+
- docker run -td --name powerapi-influxdb -e INFLUXDB_ADMIN_USER=powerapi -e INFLUXDB_ADMIN_PASSWORD=powerapi -p 8086:8086 influxdb:1.4
4441

4542
after_success:
4643
- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then sbt "project core" coverageReport; fi
4744
- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then sbt "project core" coveralls; fi
4845

4946
before_deploy:
50-
- sbt "project cpuSampling" universal:packageZipTarball
51-
- sbt "project cli" universal:packageZipTarball
52-
- tar -C powerapi-sampling-cpu/target/universal -xvf powerapi-sampling-cpu/target/universal/powerapi-sampling-cpu.tgz
53-
- tar -C powerapi-cli/target/universal -xvf powerapi-cli/target/universal/powerapi-cli.tgz
47+
- sbt "project cpuSampling" stage
48+
- tar -C powerapi-sampling-cpu/target/universal/stage -cvzf powerapi-sampling-cpu-$TRAVIS_TAG.tgz --transform "s/\./powerapi-sampling-cpu-$TRAVIS_TAG/" .
49+
- sbt "project cli" stage
50+
- tar -C powerapi-cli/target/universal/stage -cvzf powerapi-cli-$TRAVIS_TAG.tgz --transform "s/\./powerapi-cli-$TRAVIS_TAG/" .
5451

5552
deploy:
5653
provider: releases
5754
api_key:
5855
secure: Wa5OZQqXWkVuoDr8QXiCbsRmJcgxnpr36/CcDzQMjrBEGxfO5NMql0eHBnJ8DwoL109aBO48AQUoz/zwPXPCgx1l152ccMfAvtilVcTKXR52TRZKMRe/qsirxcQ6tvI1AuJ0IpRgdeH5qOp3f8EgbBKGgIilo80OlHy0LcKn+Bc=
5956
file:
60-
- "powerapi-sampling-cpu/target/universal/powerapi-sampling-cpu.tgz"
61-
- "powerapi-cli/target/universal/powerapi-cli.tgz"
57+
- powerapi-sampling-cpu-$TRAVIS_TAG.tgz
58+
- powerapi-cli-$TRAVIS_TAG.tgz
6259
skip_cleanup: true
6360
on:
6461
tags: true
6562
repo: Spirals-Team/powerapi
6663

6764
after_deploy:
6865
- sbt "project core" publishSigned sonatypeRelease
69-
- docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PWD
70-
- docker build -f docker/sampling/Dockerfile-sampling -t spirals/powerapi-sampling-cpu:$TRAVIS_TAG .
71-
- docker build -f docker/Dockerfile-cli -t spirals/powerapi-cli:$TRAVIS_TAG .
66+
- docker login -u $DOCKER_USER -p $DOCKER_PWD
67+
- docker build -f docker/sampling/Dockerfile -t spirals/powerapi-sampling-cpu:$TRAVIS_TAG .
68+
- docker push spirals/powerapi-sampling-cpu:$TRAVIS_TAG
69+
- docker build -f docker/cli/Dockerfile -t spirals/powerapi-cli:$TRAVIS_TAG .
70+
- docker push spirals/powerapi-cli:$TRAVIS_TAG
7271
- docker tag spirals/powerapi-sampling-cpu:$TRAVIS_TAG spirals/powerapi-sampling-cpu:latest
72+
- docker push spirals/powerapi-sampling-cpu:latest
7373
- docker tag spirals/powerapi-cli:$TRAVIS_TAG spirals/powerapi-cli:latest
74-
- docker push spirals/powerapi-sampling-cpu
75-
- docker push spirals/powerapi-cli
74+
- docker push spirals/powerapi-cli:latest

0 commit comments

Comments
 (0)