From ed7e064a8affa0bacf65d2d7aa671d43598d2d63 Mon Sep 17 00:00:00 2001 From: Markus Wennrich Date: Mon, 29 Apr 2024 12:12:22 +0200 Subject: [PATCH 1/3] build with go 1.22 --- Dockerfile | 2 +- go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 47f8715..9ac2bec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21 AS build +FROM golang:1.22 AS build ENV GO111MODULE=on ENV CGO_ENABLED=0 diff --git a/go.mod b/go.mod index b9687c8..6b65ad1 100644 --- a/go.mod +++ b/go.mod @@ -1,3 +1,3 @@ module github.com/mwennrich/alertlogger -go 1.21 +go 1.22 From 98dac09aa375e847060a43a1b8afe3cad049b47d Mon Sep 17 00:00:00 2001 From: Markus Wennrich Date: Mon, 29 Apr 2024 12:12:36 +0200 Subject: [PATCH 2/3] update gh-actions --- .github/workflows/ghcr.yaml | 12 ++++++------ .github/workflows/latest.yaml | 10 +++++----- .github/workflows/pull_request.yaml | 10 +++++----- .github/workflows/release.yaml | 10 +++++----- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ghcr.yaml b/.github/workflows/ghcr.yaml index 7cb4d4d..83842b0 100644 --- a/.github/workflows/ghcr.yaml +++ b/.github/workflows/ghcr.yaml @@ -22,22 +22,22 @@ jobs: steps: - name: Log in to the container registry - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: - go-version: '1.21.x' + go-version-file: 'go.mod' - name: Lint - uses: golangci/golangci-lint-action@v3 + uses: golangci/golangci-lint-action@v5 with: args: -p bugs -p unused --timeout=3m @@ -48,7 +48,7 @@ jobs: [ "${GITHUB_EVENT_NAME}" == 'push' ] && echo "tag=latest" >> $GITHUB_ENV || true - name: Build and push image - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v5 with: context: . push: true diff --git a/.github/workflows/latest.yaml b/.github/workflows/latest.yaml index 16e53b7..b9f1517 100644 --- a/.github/workflows/latest.yaml +++ b/.github/workflows/latest.yaml @@ -10,21 +10,21 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Docker Login - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKER_REGISTRY_USER }} password: ${{ secrets.DOCKER_REGISTRY_TOKEN }} - name: Setup go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: - go-version: '1.21.x' + go-version-file: 'go.mod' - name: Lint - uses: golangci/golangci-lint-action@v3 + uses: golangci/golangci-lint-action@v5 with: args: --timeout=3m -p bugs -p unused diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml index 2dbcdd5..57eda38 100644 --- a/.github/workflows/pull_request.yaml +++ b/.github/workflows/pull_request.yaml @@ -10,26 +10,26 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Figure out if running fork PR id: fork run: '["${{ secrets.DOCKER_REGISTRY_TOKEN }}" == ""] && echo "::set-output name=is_fork_pr::true" || echo "::set-output name=is_fork_pr::false"' - name: Docker Login - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKER_REGISTRY_USER }} password: ${{ secrets.DOCKER_REGISTRY_TOKEN }} if: steps.fork.outputs.is_fork_pr == 'false' - name: Setup go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: - go-version: '1.21.x' + go-version-file: 'go.mod' - name: Lint - uses: golangci/golangci-lint-action@v3 + uses: golangci/golangci-lint-action@v5 with: args: --timeout=3m -p bugs -p unused diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index e7aed8a..34b7ffd 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -10,21 +10,21 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Docker Login - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKER_REGISTRY_USER }} password: ${{ secrets.DOCKER_REGISTRY_TOKEN }} - name: Setup go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: - go-version: '1.21.x' + go-version-file: 'go.mod' - name: Lint - uses: golangci/golangci-lint-action@v3 + uses: golangci/golangci-lint-action@v5 with: args: --timeout=3m -p bugs -p unused From ab677e1b97bb3ac0a40df36e62e98c766ea248f9 Mon Sep 17 00:00:00 2001 From: Markus Wennrich Date: Wed, 4 Sep 2024 14:10:09 +0200 Subject: [PATCH 3/3] build with go 1.23 --- .github/workflows/ghcr.yaml | 4 ++-- .github/workflows/latest.yaml | 2 +- .github/workflows/pull_request.yaml | 2 +- .github/workflows/release.yaml | 2 +- Dockerfile | 2 +- go.mod | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ghcr.yaml b/.github/workflows/ghcr.yaml index 83842b0..2c879db 100644 --- a/.github/workflows/ghcr.yaml +++ b/.github/workflows/ghcr.yaml @@ -37,7 +37,7 @@ jobs: go-version-file: 'go.mod' - name: Lint - uses: golangci/golangci-lint-action@v5 + uses: golangci/golangci-lint-action@v6 with: args: -p bugs -p unused --timeout=3m @@ -48,7 +48,7 @@ jobs: [ "${GITHUB_EVENT_NAME}" == 'push' ] && echo "tag=latest" >> $GITHUB_ENV || true - name: Build and push image - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . push: true diff --git a/.github/workflows/latest.yaml b/.github/workflows/latest.yaml index b9f1517..58d3e8c 100644 --- a/.github/workflows/latest.yaml +++ b/.github/workflows/latest.yaml @@ -24,7 +24,7 @@ jobs: go-version-file: 'go.mod' - name: Lint - uses: golangci/golangci-lint-action@v5 + uses: golangci/golangci-lint-action@v6 with: args: --timeout=3m -p bugs -p unused diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml index 57eda38..82738cf 100644 --- a/.github/workflows/pull_request.yaml +++ b/.github/workflows/pull_request.yaml @@ -29,7 +29,7 @@ jobs: go-version-file: 'go.mod' - name: Lint - uses: golangci/golangci-lint-action@v5 + uses: golangci/golangci-lint-action@v6 with: args: --timeout=3m -p bugs -p unused diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 34b7ffd..d5dbff1 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -24,7 +24,7 @@ jobs: go-version-file: 'go.mod' - name: Lint - uses: golangci/golangci-lint-action@v5 + uses: golangci/golangci-lint-action@v6 with: args: --timeout=3m -p bugs -p unused diff --git a/Dockerfile b/Dockerfile index 9ac2bec..3fdd7e3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22 AS build +FROM golang:1.23 AS build ENV GO111MODULE=on ENV CGO_ENABLED=0 diff --git a/go.mod b/go.mod index 6b65ad1..2a27935 100644 --- a/go.mod +++ b/go.mod @@ -1,3 +1,3 @@ module github.com/mwennrich/alertlogger -go 1.22 +go 1.23