From ad74c8da1b76c8777a3f6449ea849afc905f3e48 Mon Sep 17 00:00:00 2001 From: Aaron Roberts Date: Thu, 29 Aug 2024 11:51:37 -0600 Subject: [PATCH 1/3] Bump go version --- Dockerfile | 4 ++-- go.mod | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3175b207..81aef881 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22 AS builder +FROM golang:1.23 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.22 +FROM golang:1.23 COPY --from=builder /go/bin/air /go/bin/air diff --git a/go.mod b/go.mod index e579d5eb..f95af687 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/air-verse/air -go 1.22 +go 1.23 require ( dario.cat/mergo v1.0.0 From 16aad74ab91d08d6c7a7457bf278dfafbffb8aef Mon Sep 17 00:00:00 2001 From: Aaron Roberts Date: Thu, 29 Aug 2024 11:56:19 -0600 Subject: [PATCH 2/3] Use go.mod file for github workflows --- .github/workflows/build.yml | 2 +- .github/workflows/release.yml | 4 ++-- .github/workflows/smoke_test_reuse_job.yml | 4 ++-- .github/workflows/smoke_test_reuse_job_windows.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d8037db5..396c9d63 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ jobs: id: go uses: actions/setup-go@v4 with: - go-version: ^1.22 + go-version-file: 'go.mod' - name: Install golangci-lint uses: golangci/golangci-lint-action@v6 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 431ad257..cea2f4d7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v4 with: - go-version: ^1.22 + go-version-file: 'go.mod' - name: Set GOVERSION run: echo "GOVERSION=$(go version | sed -r 's/go version go(.*)\ .*/\1/')" >> $GITHUB_ENV @@ -51,4 +51,4 @@ jobs: platforms: linux/amd64,linux/arm64 tags: cosmtrek/air:${{ env.VERSION }} - name: Show docker image digest - run: echo ${{ steps.docker_build.outputs.digest }} \ No newline at end of file + run: echo ${{ steps.docker_build.outputs.digest }} diff --git a/.github/workflows/smoke_test_reuse_job.yml b/.github/workflows/smoke_test_reuse_job.yml index 889204eb..be00a029 100644 --- a/.github/workflows/smoke_test_reuse_job.yml +++ b/.github/workflows/smoke_test_reuse_job.yml @@ -18,7 +18,7 @@ jobs: id: go uses: actions/setup-go@v4 with: - go-version: ^1.22 + go-version-file: 'go.mod' - name: Install run: make install - name: Check rebuild @@ -34,4 +34,4 @@ jobs: - uses: nick-invision/assert-action@v2 with: expected: "PASS" - actual: ${{ steps.check_rebuild.outputs.value }} \ No newline at end of file + actual: ${{ steps.check_rebuild.outputs.value }} diff --git a/.github/workflows/smoke_test_reuse_job_windows.yml b/.github/workflows/smoke_test_reuse_job_windows.yml index ec707558..920de082 100644 --- a/.github/workflows/smoke_test_reuse_job_windows.yml +++ b/.github/workflows/smoke_test_reuse_job_windows.yml @@ -18,7 +18,7 @@ jobs: id: go uses: actions/setup-go@v4 with: - go-version: ^1.22 + go-version-file: 'go.mod' - name: Setup Python uses: actions/setup-python@v5 with: From 7711a84d30905d8a722b6d5640be2a4b41774960 Mon Sep 17 00:00:00 2001 From: Aaron Roberts Date: Thu, 29 Aug 2024 12:03:11 -0600 Subject: [PATCH 3/3] Use latest for linter --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 396c9d63..1586578a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,7 +23,7 @@ jobs: - name: Install golangci-lint uses: golangci/golangci-lint-action@v6 with: - version: v1.59 + version: latest - name: Install dependency run: if [ $(uname) == "Darwin" ]; then brew install gnu-sed ;fi - name: Build