From 116fe9f578acdb7656f02ef02a1bc8ad42cc1464 Mon Sep 17 00:00:00 2001 From: Cecylia Bocovich Date: Sat, 15 Mar 2025 11:00:10 -0400 Subject: [PATCH] Bump minimum version of go to 1.22 This fixes a pointer bug in our broker sqs code by enabling the loopvar feature https://go.dev/wiki/LoopvarExperiment See tpo/anti-censorship/pluggable-transports/snowflake#40363 --- .gitlab-ci.yml | 8 ++++---- go.mod | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a0fac79..cb777f9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -152,8 +152,8 @@ android: - go get golang.org/x/mobile/bind - gomobile bind -v -target=android $REPRODUCIBLE_FLAGS . -go-1.21: - image: ${DOCKER_REGISTRY_URL}/golang:1.21-$DEBIAN_STABLE +go-1.22: + image: ${DOCKER_REGISTRY_URL}/golang:1.22-$DEBIAN_STABLE <<: *golang-docker-debian-template <<: *test-template script: @@ -174,7 +174,7 @@ debian-testing: - *go-test shadow-integration: - image: ${DOCKER_REGISTRY_URL}/golang:1.21-$DEBIAN_STABLE + image: ${DOCKER_REGISTRY_URL}/golang:1.22-$DEBIAN_STABLE variables: SHADOW_VERSION: "193924aae0dab30ffda0abe29467f552949849fa" TGEN_VERSION: "v1.1.2" @@ -263,7 +263,7 @@ shadow-integration: generate_tarball: stage: deploy - image: ${DOCKER_REGISTRY_URL}/golang:1.21-$DEBIAN_STABLE + image: ${DOCKER_REGISTRY_URL}/golang:1.22-$DEBIAN_STABLE rules: - if: $CI_COMMIT_TAG script: diff --git a/go.mod b/go.mod index 622c4cc..4e7f496 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2 -go 1.21 +go 1.22 require ( github.com/aws/aws-sdk-go-v2 v1.36.1