build: split other OS build into a separate builder

This is in order to make longest build (the Linux build) quicker
This commit is contained in:
Nick Craig-Wood 2019-07-02 16:54:38 +01:00
parent 9cafeeb4b6
commit 7fcbb47b1c
2 changed files with 17 additions and 14 deletions

View File

@ -60,25 +60,36 @@ matrix:
script: script:
- make quicktest - make quicktest
- go: 1.12.x - go: 1.12.x
name: Linux
env: env:
- GOTAGS=cmount - GOTAGS=cmount
- BUILD_FLAGS='-include "^linux/"'
- DEPLOY=true - DEPLOY=true
script: script:
- make build_dep - make build_dep
- make check - make check
- make quicktest - make quicktest
- make racequicktest - make racequicktest
- make compile_all
- go: 1.12.x - go: 1.12.x
name: Go modules name: Go Modules
env: env:
- GO111MODULE=on - GO111MODULE=on
script: script:
- make quicktest - make quicktest
- os: osx - go: 1.12.x
go: 1.12.x name: Other OS
env:
- DEPLOY=true
- BUILD_FLAGS='-exclude "^(windows|darwin|linux)/"'
script:
- make
- make compile_all
- go: 1.12.x
name: macOS
os: osx
env: env:
- GOTAGS= # cmount doesn't work on osx travis for some reason - GOTAGS= # cmount doesn't work on osx travis for some reason
- BUILD_FLAGS='-include "^darwin/" -cgo'
- DEPLOY=true - DEPLOY=true
cache: cache:
directories: directories:
@ -88,10 +99,12 @@ matrix:
- make quicktest - make quicktest
- make racequicktest - make racequicktest
# - os: windows # - os: windows
# name: Windows
# go: 1.12.x # go: 1.12.x
# env: # env:
# - GOTAGS=cmount # - GOTAGS=cmount
# - CPATH='C:\Program Files (x86)\WinFsp\inc\fuse' # - CPATH='C:\Program Files (x86)\WinFsp\inc\fuse'
# - BUILD_FLAGS='-include "^windows/amd64" -cgo' # 386 doesn't build yet
# #filter_secrets: false # works around a problem with secrets under windows # #filter_secrets: false # works around a problem with secrets under windows
# cache: # cache:
# directories: # directories:

View File

@ -167,16 +167,6 @@ ifndef BRANCH_PATH
endif endif
@echo Beta release ready at $(BETA_URL)/testbuilds @echo Beta release ready at $(BETA_URL)/testbuilds
BUILD_FLAGS := -exclude "^(windows|darwin)/"
ifeq ($(TRAVIS_OS_NAME),osx)
BUILD_FLAGS := -include "^darwin/" -cgo
endif
ifeq ($(TRAVIS_OS_NAME),windows)
# BUILD_FLAGS := -include "^windows/" -cgo
# 386 doesn't build yet
BUILD_FLAGS := -include "^windows/amd64" -cgo
endif
travis_beta: travis_beta:
ifeq ($(TRAVIS_OS_NAME),linux) ifeq ($(TRAVIS_OS_NAME),linux)
go run bin/get-github-release.go -extract nfpm goreleaser/nfpm 'nfpm_.*\.tar.gz' go run bin/get-github-release.go -extract nfpm goreleaser/nfpm 'nfpm_.*\.tar.gz'