Skip to content

Commit 9f026b6

Browse files
authored
Merge pull request #212 from tosuke/go-1.22
Build with go v1.22
2 parents 41c76e6 + a4c42f7 commit 9f026b6

File tree

5 files changed

+9
-15
lines changed

5 files changed

+9
-15
lines changed

.github/workflows/acceptance-test.yml

+2-8
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,9 @@ jobs:
1313
runs-on: ${{ matrix.os }}
1414
steps:
1515
- uses: actions/checkout@v4
16-
- uses: actions/setup-go@v3
16+
- uses: actions/setup-go@v5
1717
with:
18-
go-version: '1.19.x'
19-
- uses: actions/cache@v2
20-
with:
21-
path: ~/go/pkg/mod
22-
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
23-
restore-keys: |
24-
${{ runner.os }}-go-
18+
go-version: '1.22.x'
2519
- run: make test
2620
env:
2721
TF_ACC: 1

.github/workflows/lint.yml

+3
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- uses: actions/checkout@v4
14+
- uses: actions/setup-go@v5
15+
with:
16+
go-version: '1.22.x'
1417
- uses: golangci/golangci-lint-action@v4
1518
with:
1619
version: latest

.github/workflows/release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ jobs:
2626
run: git fetch --prune --unshallow
2727
-
2828
name: Set up Go
29-
uses: actions/setup-go@v3
29+
uses: actions/setup-go@v5
3030
with:
31-
go-version: '1.19.x'
31+
go-version: '1.22.x'
3232
-
3333
name: Import GPG key
3434
id: import_gpg

go.mod

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
module github.com/mackerelio-labs/terraform-provider-mackerel
22

3-
go 1.21
3+
go 1.22.0
44

55
require (
66
github.com/golangci/golangci-lint v1.50.1
7+
github.com/hashicorp/terraform-plugin-framework v1.8.0
78
github.com/hashicorp/terraform-plugin-go v0.23.0
89
github.com/hashicorp/terraform-plugin-mux v0.16.0
910
github.com/hashicorp/terraform-plugin-sdk/v2 v2.34.0
@@ -91,8 +92,6 @@ require (
9192
github.com/hashicorp/logutils v1.0.0 // indirect
9293
github.com/hashicorp/terraform-exec v0.21.0 // indirect
9394
github.com/hashicorp/terraform-json v0.22.1 // indirect
94-
github.com/hashicorp/terraform-plugin-framework v1.8.0 // indirect
95-
github.com/hashicorp/terraform-plugin-framework-validators v0.12.0 // indirect
9695
github.com/hashicorp/terraform-plugin-log v0.9.0 // indirect
9796
github.com/hashicorp/terraform-registry-address v0.2.3 // indirect
9897
github.com/hashicorp/terraform-svchost v0.1.1 // indirect

go.sum

-2
Original file line numberDiff line numberDiff line change
@@ -342,8 +342,6 @@ github.com/hashicorp/terraform-json v0.22.1 h1:xft84GZR0QzjPVWs4lRUwvTcPnegqlyS7
342342
github.com/hashicorp/terraform-json v0.22.1/go.mod h1:JbWSQCLFSXFFhg42T7l9iJwdGXBYV8fmmD6o/ML4p3A=
343343
github.com/hashicorp/terraform-plugin-framework v1.8.0 h1:P07qy8RKLcoBkCrY2RHJer5AEvJnDuXomBgou6fD8kI=
344344
github.com/hashicorp/terraform-plugin-framework v1.8.0/go.mod h1:/CpTukO88PcL/62noU7cuyaSJ4Rsim+A/pa+3rUVufY=
345-
github.com/hashicorp/terraform-plugin-framework-validators v0.12.0 h1:HOjBuMbOEzl7snOdOoUfE2Jgeto6JOjLVQ39Ls2nksc=
346-
github.com/hashicorp/terraform-plugin-framework-validators v0.12.0/go.mod h1:jfHGE/gzjxYz6XoUwi/aYiiKrJDeutQNUtGQXkaHklg=
347345
github.com/hashicorp/terraform-plugin-go v0.23.0 h1:AALVuU1gD1kPb48aPQUjug9Ir/125t+AAurhqphJ2Co=
348346
github.com/hashicorp/terraform-plugin-go v0.23.0/go.mod h1:1E3Cr9h2vMlahWMbsSEcNrOCxovCZhOOIXjFHbjc/lQ=
349347
github.com/hashicorp/terraform-plugin-log v0.9.0 h1:i7hOA+vdAItN1/7UrfBqBwvYPQ9TFvymaRGZED3FCV0=

0 commit comments

Comments
 (0)