From b860066b54382961848e5d0173812eb0a00d0613 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Fri, 30 Aug 2019 22:15:17 +0100 Subject: [PATCH 1/2] fix(ci): retry failed curl calls correctly --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 36d1c8253..b640e6688 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,14 +33,14 @@ jobs: - travis_retry make mock-assets script: make test-go after_success: - - travis_retry bash <(curl -s https://codecov.io/bash) -F backend + - travis_retry curl -s --fail https://codecov.io/bash | bash -s -- -F backend - stage: Test name: Test JavaScript code <<: *DEFAULTS_JS script: make test-js after_success: - - travis_retry bash <(curl -s https://codecov.io/bash) -F ui -s ui + - travis_retry curl -s --fail https://codecov.io/bash | bash -s -- -F ui # duplicate js test but with a different time zone, to ensure that tests/code work with non-UTC time zone - stage: Test @@ -51,7 +51,7 @@ jobs: - TZ=Pacific/Easter script: make test-js after_success: - - travis_retry bash <(curl -s https://codecov.io/bash) -F ui -s ui + - travis_retry curl -s --fail https://codecov.io/bash | bash -s -- -F ui - stage: Lint name: Lint git commit @@ -194,5 +194,5 @@ jobs: - travis_retry docker login -u _ -p "$HEROKU_TOKEN" registry.heroku.com - travis_retry docker push registry.heroku.com/karma-demo/web # bundled heroku cli doesn't know anything about containers, update it - - travis_retry curl https://cli-assets.heroku.com/install.sh | sh + - travis_retry curl -s --fail https://cli-assets.heroku.com/install.sh | sh - travis_retry /usr/local/bin/heroku container:release web --app karma-demo From 0a3b52851595d2e33abbe0b9a7101e3e544997ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Fri, 30 Aug 2019 22:24:20 +0100 Subject: [PATCH 2/2] chore(ci): move go.sum job up It's slow so better to start it early --- .travis.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index b640e6688..0fed0c5ce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -74,6 +74,15 @@ jobs: - make format-go - git diff --exit-code + - state: Lint + name: Verify go.sum + <<: *DEFAULTS_GO + script: + - travis_retry make mock-assets + - travis_retry go get -d -v + - travis_retry go mod tidy + - git diff --exit-code + - stage: Lint name: Lint JavaScript code <<: *DEFAULTS_JS @@ -91,15 +100,6 @@ jobs: <<: *DEFAULTS_JS script: make lint-docs - - state: Lint - name: Verify go.sum - <<: *DEFAULTS_GO - script: - - travis_retry make mock-assets - - travis_retry go get -d -v - - travis_retry go mod tidy - - git diff --exit-code - - stage: Build and Deploy name: Build docker image # we build and push docker image on merge and tag, so this should only