Skip to content

Commit 7c54be8

Browse files
authored
cleanup travis build file (#12)
1 parent 8308c36 commit 7c54be8

File tree

2 files changed

+18
-13
lines changed

2 files changed

+18
-13
lines changed

.travis.yml

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,38 +4,43 @@ language: minimal
44
services:
55
- docker
66

7-
matrix:
7+
jobs:
88
include:
99
- stage: Test
1010
language: go
1111
go: "1.14.x"
1212
script: make unit-test
13-
env: GO_UNIT_TESTS=TRUE
13+
name: Unit Tests
1414
after_success: bash <(curl -s https://codecov.io/bash) -v
1515
- stage: Test
1616
script: make go-report-card-test
17-
env: GO_REPORT_CARD=true
17+
name: Go Report Card Tests
1818
- stage: Test
1919
script: make spellcheck
20-
env: SPELLCHECK=true
20+
name: Markdown Spellcheck
21+
- stage: Test
22+
script: make build-binaries
23+
name: Build Binaries
24+
- stage: Test
25+
script: make build-docker-images
26+
name: Build Docker Images
2127
- stage: Test
2228
if: type = push AND env(DOCKERHUB_USERNAME) IS present
2329
script: make readme-codeblock-test
24-
env: README_CODEBLOCK_TEST=true
30+
name: README Codeblock Executions Test
2531
- stage: Test
2632
if: type = push AND env(DOCKERHUB_USERNAME) IS present
2733
script: make output-validation-test
28-
env: CFN_AND_TERRAFORM_OUTPUT_VALIDATION_TESTS=true
34+
name: CFN/Terraform Output Validation Tests
2935
- stage: Test
3036
if: type = push AND env(GITHUB_TOKEN) IS present
3137
script: test/license-test/run-license-test.sh
32-
env: LICENSE_TEST=true
38+
name: License Test
3339
- stage: Deploy
3440
if: type = push AND env(DOCKERHUB_USERNAME) IS present
3541
script: make sync-readme-to-dockerhub
36-
env: SYNC_README_TO_DOCKERHUB=true
42+
name: Sync README to Dockerhub
3743
- stage: Deploy
3844
if: type = push AND tag =~ /^v\d+\.\d+(\.\d+)?(-\S*)?$/ AND env(DOCKERHUB_USERNAME) IS present
3945
script: make release
40-
env: RELEASE_ASSETS=true
41-
46+
name: Release Assets

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ fmt:
2626
goimports -w ./ && gofmt -s -w ./
2727

2828
docker-build:
29-
${MAKEFILE_PATH}/scripts/build-docker-images -d -p ${GOOS}/${GOARCH} -r ${IMG} -v ${VERSION}
29+
${MAKEFILE_PATH}/scripts/build-docker-images -p ${GOOS}/${GOARCH} -r ${IMG} -v ${VERSION}
3030

3131
docker-run:
3232
docker run ${IMG_W_TAG}
@@ -36,7 +36,7 @@ docker-push:
3636
docker push ${IMG_W_TAG}
3737

3838
build-docker-images:
39-
${MAKEFILE_PATH}/scripts/build-docker-images -d -p ${SUPPORTED_PLATFORMS} -r ${IMG} -v ${VERSION}
39+
${MAKEFILE_PATH}/scripts/build-docker-images -p ${SUPPORTED_PLATFORMS} -r ${IMG} -v ${VERSION}
4040

4141
push-docker-images:
4242
@echo ${DOCKERHUB_TOKEN} | docker login -u ${DOCKERHUB_USERNAME} --password-stdin
@@ -66,7 +66,7 @@ output-validation-test:
6666
${MAKEFILE_PATH}/test/output-validation-test/test-output-validation
6767

6868
build-binaries:
69-
${MAKEFILE_PATH}/scripts/build-binaries -d -p ${SUPPORTED_PLATFORMS} -v ${VERSION}
69+
${MAKEFILE_PATH}/scripts/build-binaries -p ${SUPPORTED_PLATFORMS} -v ${VERSION}
7070

7171
## requires a github token
7272
upload-resources-to-github:

0 commit comments

Comments
 (0)