Skip to content

Commit

Permalink
chore(deps): bump minimal Go version from 1.21 to 1.22 (#2743)
Browse files Browse the repository at this point in the history
* fix: update devcontainer image

Caused by #2531

* chore: bump minimal Go version to 1.22
  • Loading branch information
mdelapenya authored Aug 23, 2024
1 parent a3b6173 commit 3682745
Show file tree
Hide file tree
Showing 58 changed files with 69 additions and 69 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// README at: https://github.com/devcontainers/templates/tree/main/src/go
{
"name": "Go",
"image": "mcr.microsoft.com/devcontainers/go:1.21-bookworm",
"image": "mcr.microsoft.com/devcontainers/go:1.22-bookworm",

// Features to add to the dev container. More info: https://containers.dev/features.
// "features": {},
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
test:
strategy:
matrix:
go-version: [1.21.x, 1.x]
go-version: [1.22.x, 1.x]
platform: [ubuntu-latest, macos-latest]
uses: ./.github/workflows/ci-test-go.yml
with:
Expand All @@ -44,7 +44,7 @@ jobs:
name: "Test with reaper off"
strategy:
matrix:
go-version: [1.21.x, 1.x]
go-version: [1.22.x, 1.x]
uses: ./.github/workflows/ci-test-go.yml
with:
go-version: ${{ matrix.go-version }}
Expand All @@ -61,7 +61,7 @@ jobs:
name: "Test with Rootless Docker"
strategy:
matrix:
go-version: [1.21.x, 1.x]
go-version: [1.22.x, 1.x]
platform: [ubuntu-latest]
uses: ./.github/workflows/ci-test-go.yml
with:
Expand All @@ -76,7 +76,7 @@ jobs:
test-module-generator:
strategy:
matrix:
go-version: [1.21.x, 1.x]
go-version: [1.22.x, 1.x]
platform: [ubuntu-latest, macos-latest, windows-latest]
uses: ./.github/workflows/ci-test-go.yml
with:
Expand All @@ -92,7 +92,7 @@ jobs:
needs: test
strategy:
matrix:
go-version: [1.21.x, 1.x]
go-version: [1.22.x, 1.x]
platform: [ubuntu-latest]
module: [artemis, azurite, cassandra, chroma, clickhouse, cockroachdb, compose, consul, couchbase, dolt, elasticsearch, gcloud, grafana-lgtm, inbucket, influxdb, k3s, k6, kafka, localstack, mariadb, milvus, minio, mockserver, mongodb, mssql, mysql, nats, neo4j, ollama, openfga, openldap, opensearch, postgres, pulsar, qdrant, rabbitmq, redis, redpanda, registry, surrealdb, valkey, vault, vearch, weaviate]
uses: ./.github/workflows/ci-test-go.yml
Expand All @@ -112,7 +112,7 @@ jobs:
module: [nginx, toxiproxy]
uses: ./.github/workflows/ci-test-go.yml
with:
go-version: "1.21.x"
go-version: "1.22.x"
fail-fast: true
platform: 'ubuntu-latest'
project-directory: examples/${{ matrix.module }}
Expand Down
2 changes: 1 addition & 1 deletion docs/system_requirements/ci/aws_codebuild.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ version: 0.2
phases:
install:
runtime-versions:
golang: 1.21
golang: 1.22
build:
commands:
- go test ./...
Expand Down
2 changes: 1 addition & 1 deletion docs/system_requirements/ci/concourse_ci.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
start_docker
cd repo
docker run -it --rm -v "$PWD:$PWD" -w "$PWD" -v /var/run/docker.sock:/var/run/docker.sock golang:1.21 go test ./...
docker run -it --rm -v "$PWD:$PWD" -w "$PWD" -v /var/run/docker.sock:/var/run/docker.sock golang:1.22 go test ./...
```
Finally, you can use Concourse's [fly CLI](https://concourse-ci.org/fly.html) to set the pipeline and trigger the job:
Expand Down
4 changes: 2 additions & 2 deletions docs/system_requirements/ci/dind_patterns.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ $ tree .
└── platform
└── integration_test.go

$ docker run -it --rm -v $PWD:$PWD -w $PWD -v /var/run/docker.sock:/var/run/docker.sock golang:1.21 go test ./... -v
$ docker run -it --rm -v $PWD:$PWD -w $PWD -v /var/run/docker.sock:/var/run/docker.sock golang:1.22 go test ./... -v
```

Where:
Expand All @@ -45,7 +45,7 @@ The same can be achieved with Docker Compose:

```yaml
tests:
image: golang:1.21
image: golang:1.22
stop_signal: SIGKILL
stdin_open: true
tty: true
Expand Down
2 changes: 1 addition & 1 deletion docs/system_requirements/ci/gitlab_ci.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ variables:
DOCKER_DRIVER: overlay2
test:
image: golang:1.21
image: golang:1.22
stage: test
script: go test ./... -v
```
2 changes: 1 addition & 1 deletion docs/system_requirements/ci/tekton.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
- name: source
steps:
- name: read
image: golang:1.21
image: golang:1.22
workingDir: $(workspaces.source.path)
script: go test ./... -v
volumeMounts:
Expand Down
2 changes: 1 addition & 1 deletion docs/system_requirements/ci/travis.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ is the minimal required config.
language: go
go:
- 1.x
- "1.21"
- "1.22"

services:
- docker
Expand Down
2 changes: 1 addition & 1 deletion examples/nginx/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/testcontainers/testcontainers-go/examples/nginx

go 1.21
go 1.22

require github.com/testcontainers/testcontainers-go v0.33.0

Expand Down
2 changes: 1 addition & 1 deletion examples/toxiproxy/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/testcontainers/testcontainers-go/examples/toxiproxy

go 1.21
go 1.22

require (
github.com/Shopify/toxiproxy/v2 v2.8.0
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/testcontainers/testcontainers-go

go 1.21
go 1.22

require (
dario.cat/mergo v1.0.0
Expand Down
12 changes: 6 additions & 6 deletions modulegen/_template/ci.yml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
test:
strategy:
matrix:
go-version: [1.21.x, 1.x]
go-version: [1.22.x, 1.x]
platform: [ubuntu-latest, macos-latest]
uses: ./.github/workflows/ci-test-go.yml
with:
Expand All @@ -44,7 +44,7 @@ jobs:
name: "Test with reaper off"
strategy:
matrix:
go-version: [1.21.x, 1.x]
go-version: [1.22.x, 1.x]
uses: ./.github/workflows/ci-test-go.yml
with:
go-version: {{ "${{ matrix.go-version }}" }}
Expand All @@ -61,7 +61,7 @@ jobs:
name: "Test with Rootless Docker"
strategy:
matrix:
go-version: [1.21.x, 1.x]
go-version: [1.22.x, 1.x]
platform: [ubuntu-latest]
uses: ./.github/workflows/ci-test-go.yml
with:
Expand All @@ -76,7 +76,7 @@ jobs:
test-module-generator:
strategy:
matrix:
go-version: [1.21.x, 1.x]
go-version: [1.22.x, 1.x]
platform: [ubuntu-latest, macos-latest, windows-latest]
uses: ./.github/workflows/ci-test-go.yml
with:
Expand All @@ -92,7 +92,7 @@ jobs:
needs: test
strategy:
matrix:
go-version: [1.21.x, 1.x]
go-version: [1.22.x, 1.x]
platform: [ubuntu-latest]
module: [{{ .Modules }}]
uses: ./.github/workflows/ci-test-go.yml
Expand All @@ -112,7 +112,7 @@ jobs:
module: [{{ .Examples }}]
uses: ./.github/workflows/ci-test-go.yml
with:
go-version: "1.21.x"
go-version: "1.22.x"
fail-fast: true
platform: 'ubuntu-latest'
project-directory: {{ "examples/${{ matrix.module }}" }}
Expand Down
2 changes: 1 addition & 1 deletion modulegen/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/testcontainers/testcontainers-go/modulegen

go 1.21
go 1.22

require (
github.com/spf13/cobra v1.8.0
Expand Down
2 changes: 1 addition & 1 deletion modules/artemis/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/testcontainers/testcontainers-go/modules/artemis

go 1.21
go 1.22

require (
github.com/docker/go-connections v0.5.0
Expand Down
2 changes: 1 addition & 1 deletion modules/azurite/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/testcontainers/testcontainers-go/modules/azurite

go 1.21
go 1.22

require (
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1
Expand Down
2 changes: 1 addition & 1 deletion modules/cassandra/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/testcontainers/testcontainers-go/modules/cassandra

go 1.21
go 1.22

require (
github.com/docker/go-connections v0.5.0
Expand Down
2 changes: 1 addition & 1 deletion modules/chroma/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/testcontainers/testcontainers-go/modules/chroma

go 1.21
go 1.22

require (
github.com/amikos-tech/chroma-go v0.1.2
Expand Down
2 changes: 1 addition & 1 deletion modules/clickhouse/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/testcontainers/testcontainers-go/modules/clickhouse

go 1.21
go 1.22

require (
github.com/ClickHouse/clickhouse-go/v2 v2.20.0
Expand Down
2 changes: 1 addition & 1 deletion modules/cockroachdb/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/testcontainers/testcontainers-go/modules/cockroachdb

go 1.21
go 1.22

require (
github.com/docker/go-connections v0.5.0
Expand Down
2 changes: 1 addition & 1 deletion modules/compose/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/testcontainers/testcontainers-go/modules/compose

go 1.21
go 1.22

replace github.com/testcontainers/testcontainers-go => ../..

Expand Down
2 changes: 1 addition & 1 deletion modules/consul/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/testcontainers/testcontainers-go/modules/consul

go 1.21
go 1.22

require (
github.com/hashicorp/consul/api v1.27.0
Expand Down
2 changes: 1 addition & 1 deletion modules/couchbase/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/testcontainers/testcontainers-go/modules/couchbase

go 1.21
go 1.22

toolchain go1.21.7

Expand Down
2 changes: 1 addition & 1 deletion modules/dolt/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/testcontainers/testcontainers-go/modules/dolt

go 1.21
go 1.22

require (
github.com/go-sql-driver/mysql v1.7.1
Expand Down
2 changes: 1 addition & 1 deletion modules/elasticsearch/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/testcontainers/testcontainers-go/modules/elasticsearch

go 1.21
go 1.22

require (
github.com/elastic/go-elasticsearch/v8 v8.12.1
Expand Down
2 changes: 1 addition & 1 deletion modules/gcloud/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/testcontainers/testcontainers-go/modules/gcloud

go 1.21
go 1.22

require (
cloud.google.com/go/bigquery v1.59.1
Expand Down
2 changes: 1 addition & 1 deletion modules/grafana-lgtm/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/testcontainers/testcontainers-go/modules/grafanalgtm

go 1.21
go 1.22

require (
github.com/docker/go-connections v0.5.0
Expand Down
2 changes: 1 addition & 1 deletion modules/inbucket/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/testcontainers/testcontainers-go/modules/inbucket

go 1.21
go 1.22

require (
github.com/inbucket/inbucket v2.0.0+incompatible
Expand Down
2 changes: 1 addition & 1 deletion modules/influxdb/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/testcontainers/testcontainers-go/modules/influxdb

go 1.21
go 1.22

require (
github.com/influxdata/influxdb1-client v0.0.0-20220302092344-a9ab5670611c
Expand Down
2 changes: 1 addition & 1 deletion modules/k3s/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/testcontainers/testcontainers-go/modules/k3s

go 1.21
go 1.22

require (
github.com/docker/docker v27.1.1+incompatible
Expand Down
2 changes: 1 addition & 1 deletion modules/k6/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/testcontainers/testcontainers-go/modules/k6

go 1.21
go 1.22

require (
github.com/docker/docker v27.1.1+incompatible
Expand Down
2 changes: 1 addition & 1 deletion modules/kafka/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/testcontainers/testcontainers-go/modules/kafka

go 1.21
go 1.22

require (
github.com/IBM/sarama v1.42.1
Expand Down
2 changes: 1 addition & 1 deletion modules/localstack/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/testcontainers/testcontainers-go/modules/localstack

go 1.21
go 1.22

require (
github.com/aws/aws-sdk-go v1.50.31
Expand Down
2 changes: 1 addition & 1 deletion modules/mariadb/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/testcontainers/testcontainers-go/modules/mariadb

go 1.21
go 1.22

require (
github.com/go-sql-driver/mysql v1.7.1
Expand Down
2 changes: 1 addition & 1 deletion modules/milvus/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/testcontainers/testcontainers-go/modules/milvus

go 1.21
go 1.22

require (
github.com/milvus-io/milvus-sdk-go/v2 v2.3.6
Expand Down
2 changes: 1 addition & 1 deletion modules/minio/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/testcontainers/testcontainers-go/modules/minio

go 1.21
go 1.22

require (
github.com/minio/minio-go/v7 v7.0.68
Expand Down
2 changes: 1 addition & 1 deletion modules/mockserver/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/testcontainers/testcontainers-go/modules/mockserver

go 1.21
go 1.22

require (
github.com/BraspagDevelopers/mock-server-client v0.2.2
Expand Down
Loading

0 comments on commit 3682745

Please sign in to comment.