Skip to content

Commit 2379890

Browse files
authored
Merge branch 'main' into cj/provider-integration-tests
2 parents 8b929aa + 4f417ad commit 2379890

File tree

5 files changed

+6
-8
lines changed

5 files changed

+6
-8
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "terraform-provider-coder",
3-
"image": "mcr.microsoft.com/devcontainers/go:1.20",
3+
"image": "mcr.microsoft.com/devcontainers/go:1.22",
44
"features": {
55
"ghcr.io/devcontainers/features/terraform:1": {
66
"installTerraformDocs": true

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Set up Go
2828
uses: actions/setup-go@v5
2929
with:
30-
go-version: 1.20.6
30+
go-version: 1.22.3
3131

3232
- name: Import GPG key
3333
id: import_gpg

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Set up Go
2323
uses: actions/setup-go@v5
2424
with:
25-
go-version: "1.20"
25+
go-version: "1.22"
2626
id: go
2727

2828
- name: Check out code into the Go module directory
@@ -59,7 +59,7 @@ jobs:
5959
- name: Set up Go
6060
uses: actions/setup-go@v5
6161
with:
62-
go-version: "1.20"
62+
go-version: "1.22"
6363
id: go
6464

6565
- uses: hashicorp/setup-terraform@v3
@@ -89,7 +89,7 @@ jobs:
8989
- name: Set up Go
9090
uses: actions/setup-go@v5
9191
with:
92-
go-version: "1.20"
92+
go-version: "1.22"
9393
id: go
9494

9595
- uses: hashicorp/setup-terraform@v3

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/coder/terraform-provider-coder
22

3-
go 1.21
3+
go 1.22
44

55
toolchain go1.22.3
66

go.sum

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,6 @@ github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
5858
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
5959
github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68=
6060
github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
61-
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
62-
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
6361
github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
6462
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
6563
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=

0 commit comments

Comments
 (0)