chore: bump Go to v1.25 (#7184)

This commit is contained in:
Kévin Dunglas 2025-08-14 16:38:42 +02:00 committed by GitHub
parent 7590c9ca1b
commit 05acc5131e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 14 additions and 14 deletions

View file

@ -30,13 +30,13 @@ jobs:
- mac - mac
- windows - windows
go: go:
- '1.24' - '1.25'
include: include:
# Set the minimum Go patch version for the given Go minor # Set the minimum Go patch version for the given Go minor
# Usable via ${{ matrix.GO_SEMVER }} # Usable via ${{ matrix.GO_SEMVER }}
- go: '1.24' - go: '1.25'
GO_SEMVER: '~1.24.1' GO_SEMVER: '~1.25.0'
# Set some variables per OS, usable via ${{ matrix.VAR }} # Set some variables per OS, usable via ${{ matrix.VAR }}
# OS_LABEL: the VM label from GitHub Actions (see https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories) # OS_LABEL: the VM label from GitHub Actions (see https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories)
@ -234,7 +234,7 @@ jobs:
- name: Install Go - name: Install Go
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
with: with:
go-version: "~1.24" go-version: "~1.25"
check-latest: true check-latest: true
- name: Install xcaddy - name: Install xcaddy
run: | run: |

View file

@ -34,13 +34,13 @@ jobs:
- 'darwin' - 'darwin'
- 'netbsd' - 'netbsd'
go: go:
- '1.24' - '1.25'
include: include:
# Set the minimum Go patch version for the given Go minor # Set the minimum Go patch version for the given Go minor
# Usable via ${{ matrix.GO_SEMVER }} # Usable via ${{ matrix.GO_SEMVER }}
- go: '1.24' - go: '1.25'
GO_SEMVER: '~1.24.1' GO_SEMVER: '~1.25.0'
runs-on: ubuntu-latest runs-on: ubuntu-latest
permissions: permissions:

View file

@ -52,7 +52,7 @@ jobs:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
with: with:
go-version: '~1.24' go-version: '~1.25'
check-latest: true check-latest: true
- name: golangci-lint - name: golangci-lint
@ -80,7 +80,7 @@ jobs:
- name: govulncheck - name: govulncheck
uses: golang/govulncheck-action@b625fbe08f3bccbe446d94fbf87fcc875a4f50ee # v1.0.4 uses: golang/govulncheck-action@b625fbe08f3bccbe446d94fbf87fcc875a4f50ee # v1.0.4
with: with:
go-version-input: '~1.24.1' go-version-input: '~1.25.0'
check-latest: true check-latest: true
dependency-review: dependency-review:

View file

@ -20,13 +20,13 @@ jobs:
os: os:
- ubuntu-latest - ubuntu-latest
go: go:
- '1.24' - '1.25'
include: include:
# Set the minimum Go patch version for the given Go minor # Set the minimum Go patch version for the given Go minor
# Usable via ${{ matrix.GO_SEMVER }} # Usable via ${{ matrix.GO_SEMVER }}
- go: '1.24' - go: '1.25'
GO_SEMVER: '~1.24.1' GO_SEMVER: '~1.25.0'
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
# https://github.com/sigstore/cosign/issues/1258#issuecomment-1002251233 # https://github.com/sigstore/cosign/issues/1258#issuecomment-1002251233

View file

@ -89,7 +89,7 @@ See [our online documentation](https://caddyserver.com/docs/install) for other i
Requirements: Requirements:
- [Go 1.24.0 or newer](https://golang.org/dl/) - [Go 1.25.0 or newer](https://golang.org/dl/)
### For development ### For development

2
go.mod
View file

@ -1,6 +1,6 @@
module github.com/caddyserver/caddy/v2 module github.com/caddyserver/caddy/v2
go 1.24 go 1.25
require ( require (
github.com/BurntSushi/toml v1.5.0 github.com/BurntSushi/toml v1.5.0