Skip to content

Commit

Permalink
Merge branch 'master' into migrate_to_plugin_testing
Browse files Browse the repository at this point in the history
  • Loading branch information
remyleone authored Feb 4, 2025
2 parents b526bf7 + 573ed80 commit 5715f2d
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 46 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/acceptance-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,12 @@ jobs:
# Checkout should always be before setup-go to ensure caching is working
- name: Checkout
uses: actions/checkout@v4
- name: Install Terraform
uses: hashicorp/setup-terraform@v3
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: 1.22
go-version: 1.23.5
- name: Run Acceptance Tests
run: go test -v ./internal/services/${{ matrix.products }} -timeout=2h
env:
Expand All @@ -74,7 +76,9 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: 1.22
go-version: 1.23.5
- name: Install Terraform
uses: hashicorp/setup-terraform@v3
- name: Run scwconfig tests
run: go test -v ./internal/services/scwconfig -timeout=2m
env:
Expand Down
29 changes: 0 additions & 29 deletions .github/workflows/coverage.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
- docs/**

env:
GO_VERSION: "1.22"
GO_VERSION: "1.23.5"
GO111MODULE: on

jobs:
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: 1.22
go-version: 1.23.5
- name: Run Acceptance Tests
run: go test -v ./internal/services/${{ matrix.products }} -timeout=4h
env:
Expand Down Expand Up @@ -103,7 +103,9 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: 1.22
go-version: 1.23.5
- name: Install Terraform
uses: hashicorp/setup-terraform@v3
- name: Run sweepers
run: make sweep
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.22
go-version: 1.23.5

- name: Import GPG key
id: import_gpg
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tfproviderlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: 1.22
go-version: 1.23.5
- name: Install tfproviderlint
run: go install github.com/bflad/tfproviderlint/cmd/tfproviderlint
- name: Run tfproviderlint
Expand All @@ -25,7 +25,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: 1.22
go-version: 1.23.5
- uses: hashicorp/setup-terraform@v3
- run: go install github.com/bflad/tfproviderdocs@latest
- run: make tfproviderdocs
10 changes: 4 additions & 6 deletions .github/workflows/unit-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,7 @@ on:

jobs:
tests:
strategy:
matrix:
go-version: [1.22.x]
platform: [ubuntu-latest]
runs-on: ${{ matrix.platform }}
runs-on: ubuntu-latest
steps:
# Checkout should always be before setup-go to ensure caching is working
- name: Checkout
Expand All @@ -20,7 +16,9 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: ${{ matrix.go-version }}
go-version: 1.23.5
- name: Install Terraform
uses: hashicorp/setup-terraform@v3
- name: Build binaries
run: make build
- name: Run unit tests
Expand Down
4 changes: 1 addition & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module github.com/scaleway/terraform-provider-scaleway/v2

go 1.22.0

toolchain go1.23.1
go 1.23.5

require (
github.com/aws/aws-sdk-go-v2 v1.32.7
Expand Down

0 comments on commit 5715f2d

Please sign in to comment.