Skip to content

Commit

Permalink
Add mac builds, speed up win builds (#72)
Browse files Browse the repository at this point in the history
* Add mac builds, speed up win builds

Closes #65

* bump xcode to 12.0.0

Co-authored-by: Radek Simko <radek.simko@gmail.com>
  • Loading branch information
paultyng and radeksimko authored Sep 25, 2020
1 parent 7bc5e72 commit afe3776
Showing 1 changed file with 31 additions and 16 deletions.
47 changes: 31 additions & 16 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,20 @@ orbs:
commands:
win_install_go:
steps:
- run: choco install golang --version 1.14.6 --yes
- run:
command: |
choco install golang --version 1.14.6 --yes
go version
macos_install_go:
steps:
- run:
# just latest stable version of Go as a sanity check
# version specification would require a brew update probably
# so this keeps it faster
command: |
brew install golang
go version
go_build:
steps:
- run: go build ./...
Expand All @@ -15,19 +28,24 @@ commands:
- run: go test -v ./...

jobs:
winbuild:
executor:
name: win/default
# combined due to slowness of Go install
macosbuildtest:
macos:
xcode: "12.0.0"
steps:
- macos_install_go
- checkout
- win_install_go
- go_build
wintest:
- go_test

# combined due to slowness of Go install
winbuildtest:
executor:
name: win/default
steps:
- checkout
- win_install_go
- checkout
- go_build
- go_test

go112_build:
Expand Down Expand Up @@ -104,10 +122,8 @@ workflows:
# TODO: add a `nightly` run for checking against TF master branch using TFEXEC_E2ETEST_VERSIONS
pr:
jobs:
- winbuild
- wintest:
requires:
- winbuild
- winbuildtest
- macosbuildtest

# build only for these versions
- go112_build
Expand All @@ -130,10 +146,8 @@ workflows:
- go115_build
release:
jobs:
- winbuild
- wintest:
requires:
- winbuild
- winbuildtest
- macosbuildtest

# build only for these versions
- go112_build
Expand Down Expand Up @@ -175,4 +189,5 @@ workflows:
- go115_test
- go115_vet
- go115_fmt
- wintest
- winbuildtest
- macosbuildtest

0 comments on commit afe3776

Please sign in to comment.