Skip to content

Commit

Permalink
go bump
Browse files Browse the repository at this point in the history
  • Loading branch information
chrischdi committed Apr 4, 2024
1 parent 9a2e684 commit c41be91
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
run:
timeout: 10m
go: "1.21"
go: "1.22"
build-tags:
- tools
- e2e
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ SHELL:=/usr/bin/env bash
#
# Go.
#
GO_VERSION ?= 1.21.9
GO_VERSION ?= 1.22.2
GO_DIRECTIVE_VERSION ?= 1.21
GO_CONTAINER_IMAGE ?= docker.io/library/golang:$(GO_VERSION)

Expand Down
4 changes: 2 additions & 2 deletions Tiltfile
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ def load_provider_tiltfiles():

tilt_helper_dockerfile_header = """
# Tilt image
FROM golang:1.21.9 as tilt-helper
FROM golang:1.22.2 as tilt-helper
# Install delve. Note this should be kept in step with the Go release minor version.
RUN go install github.com/go-delve/delve/cmd/dlv@v1.21
# Support live reloading with Tilt
Expand All @@ -195,7 +195,7 @@ RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com
"""

tilt_dockerfile_header = """
FROM golang:1.21.9 as tilt
FROM golang:1.22.2 as tilt
WORKDIR /
COPY --from=tilt-helper /process.txt .
COPY --from=tilt-helper /start.sh .
Expand Down

0 comments on commit c41be91

Please sign in to comment.