From 920a28711746c8e44ef3e6270a41f038d767d92b Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Wed, 11 Nov 2020 23:52:50 +0100
Subject: [PATCH] .travis.yml: move test builders after install builders
(#21833)
---
.travis.yml | 62 ++++++++++++++++++++++++++---------------------------
1 file changed, 31 insertions(+), 31 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 03eada24a..132a3f1eb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,37 +24,6 @@ jobs:
script:
- go run build/ci.go lint
- - stage: build
- os: linux
- dist: xenial
- go: 1.14.x
- env:
- - GO111MODULE=on
- script:
- - go run build/ci.go test -coverage $TEST_PACKAGES
-
- # These are the latest Go versions.
- - stage: build
- os: linux
- arch: amd64
- dist: xenial
- go: 1.15.x
- env:
- - GO111MODULE=on
- script:
- - go run build/ci.go test -coverage $TEST_PACKAGES
-
- - stage: build
- if: type = pull_request
- os: linux
- arch: arm64
- dist: xenial
- go: 1.15.x
- env:
- - GO111MODULE=on
- script:
- - go run build/ci.go test -coverage $TEST_PACKAGES
-
# This builder does the Ubuntu PPA upload
- stage: build
if: type = push
@@ -215,6 +184,37 @@ jobs:
- export CGO_CFLAGS_ALLOW='-fmodules|-fblocks|-fobjc-arc'
- go run build/ci.go xcode -signer IOS_SIGNING_KEY -deploy trunk -upload gethstore/builds
+ # These builders run the tests
+ - stage: build
+ os: linux
+ arch: amd64
+ dist: xenial
+ go: 1.15.x
+ env:
+ - GO111MODULE=on
+ script:
+ - go run build/ci.go test -coverage $TEST_PACKAGES
+
+ - stage: build
+ if: type = pull_request
+ os: linux
+ arch: arm64
+ dist: xenial
+ go: 1.15.x
+ env:
+ - GO111MODULE=on
+ script:
+ - go run build/ci.go test -coverage $TEST_PACKAGES
+
+ - stage: build
+ os: linux
+ dist: xenial
+ go: 1.14.x
+ env:
+ - GO111MODULE=on
+ script:
+ - go run build/ci.go test -coverage $TEST_PACKAGES
+
# This builder does the Azure archive purges to avoid accumulating junk
- stage: build
if: type = cron
--
GitLab