Skip to content

Commit

Permalink
Bump go to 1.23
Browse files Browse the repository at this point in the history
  • Loading branch information
MoritzKrafeld committed Sep 20, 2024
1 parent 6403f4d commit 568cbce
Show file tree
Hide file tree
Showing 10 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ jobs:
id: go
uses: actions/setup-go@v4
with:
go-version: ^1.22
go-version: ^1.23
- name: Install golangci-lint
uses: golangci/golangci-lint-action@v6
with:
version: v1.59
version: v1.60.3
- name: Install dependency
run: if [ $(uname) == "Darwin" ]; then brew install gnu-sed ;fi
- name: Build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v4
with:
go-version: ^1.22
go-version: ^1.23

- name: Set GOVERSION
run: echo "GOVERSION=$(go version | sed -r 's/go version go(.*)\ .*/\1/')" >> $GITHUB_ENV
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/smoke_test_reuse_job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
id: go
uses: actions/setup-go@v4
with:
go-version: ^1.22
go-version: ^1.23
- name: Install
run: make install
- name: Check rebuild
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/smoke_test_reuse_job_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
id: go
uses: actions/setup-go@v4
with:
go-version: ^1.22
go-version: ^1.23
- name: Setup Python
uses: actions/setup-python@v5
with:
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.22 AS builder
FROM golang:1.23 AS builder

LABEL maintainer="Rick Yu <[email protected]>"

Expand All @@ -12,7 +12,7 @@ RUN --mount=type=cache,target=/go/pkg/mod go mod download

RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build make ci && make install

FROM golang:1.22
FROM golang:1.23

COPY --from=builder /go/bin/air /go/bin/air

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ LDFLAGS += -X "main.airVersion=$(AIRVER)"
LDFLAGS += -X "main.goVersion=$(shell go version | sed -r 's/go version go(.*)\ .*/\1/')"

GO := GO111MODULE=on CGO_ENABLED=0 go
GOLANGCI_LINT_VERSION = v1.56.2
GOLANGCI_LINT_VERSION = v1.60.3

.PHONY: init
init: install-golangci-lint
Expand Down
2 changes: 1 addition & 1 deletion README-zh_cn.md
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ services:

```Dockerfile
# 选择你想要的版本,>= 1.16
FROM golang:1.22-alpine
FROM golang:1.23-alpine
WORKDIR /app
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ services:

```Dockerfile
# Choose whatever you want, version >= 1.16
FROM golang:1.22-alpine
FROM golang:1.23-alpine
WORKDIR /app
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/air-verse/air

go 1.22
go 1.23

require (
dario.cat/mergo v1.0.0
Expand Down
2 changes: 1 addition & 1 deletion smoke_test/check_rebuild/go.mod
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module air.sample.com

go 1.17
go 1.23

0 comments on commit 568cbce

Please sign in to comment.