Skip to content

Commit

Permalink
Merge pull request #432 from hashicorp/f/ci-updates
Browse files Browse the repository at this point in the history
tooling: updating Go, TeamCity & Terraform Core
  • Loading branch information
manicminer authored May 11, 2021
2 parents 406df62 + dcbb53a commit 3921bc3
Show file tree
Hide file tree
Showing 11 changed files with 15 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/depscheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: '1.16.0'
go-version: '1.16.3'
- run: bash scripts/gogetcookie.sh
- run: make tools
- run: make depscheck
2 changes: 1 addition & 1 deletion .github/workflows/docs-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: '1.16.0'
go-version: '1.16.3'
- run: bash scripts/gogetcookie.sh
- run: make tools
- run: make docs-lint
2 changes: 1 addition & 1 deletion .github/workflows/golint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: '1.16.0'
go-version: '1.16.3'
- uses: golangci/golangci-lint-action@v2
with:
version: 'v1.32'
2 changes: 1 addition & 1 deletion .github/workflows/teamcity-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-java@v1
with:
java-version: '13'
java-version: '11'
java-package: jdk
- uses: actions/cache@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tflint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: '1.16.0'
go-version: '1.16.3'
- run: bash scripts/gogetcookie.sh
- run: make tools
- run: make tflint
2 changes: 1 addition & 1 deletion .github/workflows/thirty-two-bit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: '1.16.0'
go-version: '1.16.3'
- run: bash scripts/gogetcookie.sh
- run: make tools
- run: GOARCH=386 GOOS=linux go build -o 32bitbuild .
3 changes: 1 addition & 2 deletions .github/workflows/unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: '1.16.0'
go-version: '1.16.3'
- run: bash scripts/gogetcookie.sh
- run: make test

2 changes: 1 addition & 1 deletion .go-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.16.0
1.16.3
2 changes: 1 addition & 1 deletion .teamcity/components/settings.kt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ var defaultStartHour = 0
var defaultParallelism = 20

// specifies the default version of Terraform Core which should be used for testing
var defaultTerraformCoreVersion = "0.12.28"
var defaultTerraformCoreVersion = "0.15.3"

var locations = mapOf(
"public" to LocationConfiguration("westeurope", "eastus2", "francecentral", false),
Expand Down
2 changes: 1 addition & 1 deletion .teamcity/settings.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import AzureAD
import ClientConfiguration
import jetbrains.buildServer.configs.kotlin.v2019_2.*

version = "2020.1"
version = "2020.2"

var clientId = DslContext.getParameter("clientId", "")
var clientSecret = DslContext.getParameter("clientSecret", "")
Expand Down
11 changes: 5 additions & 6 deletions GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,17 @@ PROVIDER=azuread
.EXPORT_ALL_VARIABLES:
TF_SCHEMA_PANIC_ON_ERROR=1
GO111MODULE=on
GOFLAGS=-mod=vendor

default: build

tools:
@echo "==> installing required tooling..."
@sh "$(CURDIR)/scripts/gogetcookie.sh"
GO111MODULE=off go get -u github.com/client9/misspell/cmd/misspell
GO111MODULE=off go get -u github.com/bflad/tfproviderlint/cmd/tfproviderlintx
GO111MODULE=off go get -u github.com/bflad/tfproviderdocs
GO111MODULE=off go get -u github.com/katbyte/terrafmt
GO111MODULE=off go get -u mvdan.cc/gofumpt
go install github.com/client9/misspell/cmd/misspell@latest
go install github.com/bflad/tfproviderlint/cmd/tfproviderlintx@latest
go install github.com/bflad/tfproviderdocs@latest
go install github.com/katbyte/terrafmt@latest
go install mvdan.cc/gofumpt@latest
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $$(go env GOPATH || $$GOPATH)/bin v1.32.0

build: fmtcheck
Expand Down

0 comments on commit 3921bc3

Please sign in to comment.