Skip to content

Commit

Permalink
chore: upgrade go to v1.23.2 (gomods#1997)
Browse files Browse the repository at this point in the history
Upgrades Go to 1.23.2
  • Loading branch information
nrwiersma authored Nov 14, 2024
1 parent 76e7c37 commit e53c524
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 13 deletions.
2 changes: 1 addition & 1 deletion Dockerfile.test
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG GOLANG_VERSION=1.22
ARG GOLANG_VERSION=1.23
FROM golang:$GOLANG_VERSION

RUN echo $GOLANG_VERSION
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
VERSION = "unset"
DATE=$(shell date -u +%Y-%m-%d-%H:%M:%S-%Z)

GOLANGCI_LINT_VERSION=v1.51.2
GOLANGCI_LINT_VERSION=v1.61.0

ifndef GOLANG_VERSION
override GOLANG_VERSION = 1.22.4
override GOLANG_VERSION = 1.23.2
endif

.PHONY: build
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ environment:
GOPROXY: https://proxy.golang.org
SKIP_UNTIL_113: true

stack: go 1.22
stack: go 1.23

test_script:
- go version
Expand Down
4 changes: 2 additions & 2 deletions cmd/proxy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
# You can override the Go version used to build the image.
# See project Makefile if using make.
# See docker --build-arg if building directly.
ARG GOLANG_VERSION=1.22
ARG ALPINE_VERSION=3.17
ARG GOLANG_VERSION=1.23
ARG ALPINE_VERSION=3.20

FROM golang:${GOLANG_VERSION}-alpine AS builder

Expand Down
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ services:
context: .
dockerfile: cmd/proxy/Dockerfile
args:
GOLANG_VERSION: "1.22"
GOLANG_VERSION: "1.23"
environment:
- ATHENS_MONGO_STORAGE_URL=mongodb://mongo:27017
- TIMEOUT=20 # in case the mongo dependency takes longer to start up
Expand All @@ -20,7 +20,7 @@ services:
context: .
dockerfile: Dockerfile.test
args:
GOLANG_VERSION: "1.22"
GOLANG_VERSION: "1.23"
command: ["./scripts/test_unit.sh"]
environment:
- GO_ENV=test
Expand All @@ -36,7 +36,7 @@ services:
context: .
dockerfile: Dockerfile.test
args:
GOLANG_VERSION: "1.22"
GOLANG_VERSION: "1.23"
command: ["./scripts/test_e2e.sh"]
azurite:
image: arafato/azurite:2.6.5
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/gomods/athens

go 1.22.7

toolchain go1.23.2
go 1.23.2

require (
cloud.google.com/go/storage v1.45.0
Expand Down
2 changes: 1 addition & 1 deletion scripts/build-image/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.22-bullseye
FROM golang:1.23-bookworm

WORKDIR /tmp

Expand Down

0 comments on commit e53c524

Please sign in to comment.