diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d3d98efc..9442f5dc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,11 +15,11 @@ jobs: steps: - name: check out code uses: actions/checkout@v4 - - name: setup Go 1.21 + - name: setup Go 1.22 id: go uses: actions/setup-go@v4 with: - go-version: ^1.21 + go-version: ^1.22 - name: build run: make build - name: install dependency diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 72569862..28f8956f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ jobs: - name: setup Go uses: actions/setup-go@v2 with: - go-version: ^1.21 + go-version: ^1.22 - name: set GOVERSION run: echo "GOVERSION=$(go version | sed -r 's/go version go(.*)\ .*/\1/')" >> $GITHUB_ENV - name: set AirVersion diff --git a/.github/workflows/smoke_test_reuse_job.yml b/.github/workflows/smoke_test_reuse_job.yml index 4db510a6..5b501587 100644 --- a/.github/workflows/smoke_test_reuse_job.yml +++ b/.github/workflows/smoke_test_reuse_job.yml @@ -14,11 +14,11 @@ jobs: steps: - name: check out code uses: actions/checkout@v2 - - name: setup Go 1.21 + - name: setup Go 1.22 id: go uses: actions/setup-go@v2 with: - go-version: ^1.21 + go-version: ^1.22 - name: install run: make install - name: check rebuild diff --git a/.github/workflows/smoke_test_window_reust_job.yml b/.github/workflows/smoke_test_window_reust_job.yml index 50ca1343..2003d0e4 100644 --- a/.github/workflows/smoke_test_window_reust_job.yml +++ b/.github/workflows/smoke_test_window_reust_job.yml @@ -14,11 +14,11 @@ jobs: steps: - name: check out code uses: actions/checkout@v2 - - name: setup Go 1.21 + - name: setup Go 1.22 id: go uses: actions/setup-go@v2 with: - go-version: ^1.21 + go-version: ^1.22 - name: Setup Python uses: actions/setup-python@v2 with: diff --git a/Dockerfile b/Dockerfile index 96bc3445..3175b207 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21 AS builder +FROM golang:1.22 AS builder LABEL maintainer="Rick Yu " @@ -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.21 +FROM golang:1.22 COPY --from=builder /go/bin/air /go/bin/air diff --git a/README.md b/README.md index 1760be9f..26d86b02 100644 --- a/README.md +++ b/README.md @@ -205,7 +205,7 @@ services: ```Dockerfile # Choose whatever you want, version >= 1.16 -FROM golang:1.21-alpine +FROM golang:1.22-alpine WORKDIR /app diff --git a/go.mod b/go.mod index 09b9fb25..849211d3 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/cosmtrek/air -go 1.21 +go 1.22 require ( dario.cat/mergo v1.0.0