From 15af6bec601b13dfb3f4ee469446d196a04cbcd1 Mon Sep 17 00:00:00 2001 From: silverwind Date: Sat, 25 Jan 2020 17:42:38 +0100 Subject: [PATCH] combine make calls on drone (#9979) * combine make calls on drone combine most make calls on drone into one command. this should give a speedup of about 5-15 seconds per make invocation because make only needs to resolve file globs once. * combine timeout calls as well --- .drone.yml | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/.drone.yml b/.drone.yml index 5e62a85a7a..12017fc51f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -15,8 +15,7 @@ steps: pull: always image: node:10 # this step is kept at the lowest version of node that we support commands: - - make css - - make js + - make css js - name: build-without-gcc pull: always @@ -42,12 +41,7 @@ steps: pull: always image: golang:1.13 commands: - - make clean - - make golangci-lint - - make revive - - make swagger-check - - make swagger-validate - - make test-vendor + - make clean golangci-lint revive swagger-check swagger-validate test-vendor environment: GOPROXY: https://goproxy.cn # proxy.golang.org is blocked in China, this proxy is not GOSUMDB: sum.golang.org @@ -137,8 +131,7 @@ steps: commands: - "curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash" - apt-get install -y git-lfs - - make test-mysql-migration - - make integration-test-coverage + - make test-mysql-migration integration-test-coverage environment: GOPROXY: off TAGS: bindata @@ -152,8 +145,7 @@ steps: commands: - "curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash" - apt-get install -y git-lfs - - timeout -s ABRT 20m make test-mysql8-migration - - timeout -s ABRT 20m make test-mysql8 + - timeout -s ABRT 40m make test-mysql8-migration test-mysql8 environment: GOPROXY: off TAGS: bindata @@ -167,8 +159,7 @@ steps: commands: - "curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash" - apt-get install -y git-lfs - - make test-mssql-migration - - make test-mssql + - make test-mssql-migration test-mssql environment: GOPROXY: off TAGS: bindata @@ -265,8 +256,7 @@ steps: commands: - "curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash" - apt-get install -y git-lfs - - timeout -s ABRT 20m make test-sqlite-migration - - timeout -s ABRT 20m make test-sqlite + - timeout -s ABRT 40m make test-sqlite-migration test-sqlite environment: GOPROXY: off TAGS: bindata @@ -279,8 +269,7 @@ steps: commands: - "curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash" - apt-get install -y git-lfs - - timeout -s ABRT 20m make test-pgsql-migration - - timeout -s ABRT 20m make test-pgsql + - timeout -s ABRT 40m make test-pgsql-migration test-pgsql environment: GOPROXY: off TAGS: bindata @@ -548,9 +537,7 @@ steps: commands: - apk add --no-cache make bash curl - cd docs - - make trans-copy - - make clean - - make build + - make trans-copy clean build - name: publish-docs pull: always