From a75f7778bee2e20529e1ab5e07f0872c29531e91 Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Fri, 4 Oct 2019 14:15:01 -0700 Subject: [PATCH] make builds share vendor fetch --- .drone.yml | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/.drone.yml b/.drone.yml index 2570509f..0a53dbc6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,6 +3,20 @@ workspace: path: ui pipeline: + fetch: + image: therecipe/qt:linux_static + environment: + - QT_DIR=/opt/Qt + - QT_DOCKER='true' + - QT_API=5.13.0 + - GO111MODULE=on + - GOCACHE=/media/sf_GOPATH1/src/cwtch.im/ui/.cache/go-build + commands: + - export PATH=$PATH:/home/user/work/bin:/media/sf_GOPATH1/bin + - apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git openssh-client + - git fetch --tags + - go mod download + - $QT_DIR/$QT_API/gcc_64/bin/lrelease ui.pro build-linux: mem_limit: 3G image: therecipe/qt:linux_static @@ -14,16 +28,14 @@ pipeline: - QT_DIR=/opt/Qt - QT_DOCKER='true' - QT_API=5.13.0 + - export GO111MODULE=on + - GOCACHE=/media/sf_GOPATH1/src/cwtch.im/ui/.cache/go-build commands: - - export GOPATH=$GOPATH:/media/sf_GOPATH1/ - export PATH=$PATH:/home/user/work/bin:/media/sf_GOPATH1/bin - apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git openssh-client - - export GO111MODULE=on - - go mod download - - $QT_DIR/$QT_API/gcc_64/bin/lrelease ui.pro - - git fetch --tags - export VERSION=`git describe --tags` - export BUILDDATE=`date +%G-%m-%d-%H-%M` + - rm -rf vendor - go mod vendor - qtdeploy -ldflags "-X main.buildVer=$VERSION -X main.buildDate=$BUILDDATE" build linux - cp README.md deploy/linux @@ -47,12 +59,11 @@ pipeline: - ANDROID_NDK_DIR=/home/user/android-ndk-r18b - ANDROID_SDK_DIR=/home/user/android-sdk-linux - GO111MODULE=on + - GOCACHE=/media/sf_GOPATH1/src/cwtch.im/ui/.cache/go-build commands: - export PATH=$PATH:/home/user/work/bin:/media/sf_GOPATH1/bin - apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git - - rm -r vendor/ - make clean - - go mod download - export VERSION=`git describe --tags` - export BUILDDATE=`date +%G-%m-%d-%H-%M` - go mod vendor @@ -73,15 +84,12 @@ pipeline: - QT_DIR=/opt/Qt - QT_DOCKER='true' - QT_API=5.13.0 + - export GO111MODULE=on + - GOCACHE=/media/sf_GOPATH1/src/cwtch.im/ui/.cache/go-build commands: - - export GOPATH=$GOPATH:/media/sf_GOPATH1/ - export PATH=$PATH:/home/user/work/bin:/media/sf_GOPATH1/bin - apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git zip - - rm -r vendor/github.com/therecipe/qt/ - - find -iname 'moc*' | xargs rm - - find -iname 'rcc*' | xargs rm - - export GO111MODULE=on - - go mod download + - make clean - export VERSION=`git describe --tags` - export BUILDDATE=`date +%G-%m-%d-%H-%M` - go mod vendor