From dc979a0be8b9f494c6a74996739b5e4e93c8e13b Mon Sep 17 00:00:00 2001 From: bluenviron-bot <214245907+bluenviron-bot@users.noreply.github.com> Date: Thu, 30 Apr 2026 16:23:45 +0200 Subject: [PATCH] bump Golang to 1.26 (#5721) --- .github/workflows/lint.yml | 12 ++++++------ .github/workflows/test.yml | 2 +- Makefile | 2 +- docs/6-misc/1-compile.md | 6 +++--- go.mod | 2 +- internal/conf/conf.go | 3 +-- 6 files changed, 13 insertions(+), 14 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 858accbe..9eef90fa 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/setup-go@v6 with: - go-version: "1.25" + go-version: "1.26" - run: go generate ./... @@ -33,7 +33,7 @@ jobs: - uses: actions/setup-go@v6 with: - go-version: "1.25" + go-version: "1.26" - run: make lint-go-mod @@ -45,7 +45,7 @@ jobs: - uses: actions/setup-go@v6 with: - go-version: "1.25" + go-version: "1.26" - run: make lint-conf @@ -57,7 +57,7 @@ jobs: - uses: actions/setup-go@v6 with: - go-version: "1.25" + go-version: "1.26" - run: make lint-go2api @@ -69,7 +69,7 @@ jobs: - uses: actions/setup-go@v6 with: - go-version: "1.25" + go-version: "1.26" - run: make lint-docslinks @@ -81,7 +81,7 @@ jobs: - uses: actions/setup-go@v6 with: - go-version: "1.25" + go-version: "1.26" - run: make lint-docsorder diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c1f03643..04e2d3d5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -41,6 +41,6 @@ jobs: - uses: actions/setup-go@v6 with: - go-version: "1.25" + go-version: "1.26" - run: make test-e2e-nodocker diff --git a/Makefile b/Makefile index 4303de72..2b26f12f 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -BASE_IMAGE = golang:1.25-alpine3.22 +BASE_IMAGE = golang:1.26-alpine3.22 GOLANGCI_LINT_IMAGE = golangci/golangci-lint:v2.11.4 NODE_IMAGE = node:20-alpine3.22 diff --git a/docs/6-misc/1-compile.md b/docs/6-misc/1-compile.md index f749bcec..d50c022a 100644 --- a/docs/6-misc/1-compile.md +++ b/docs/6-misc/1-compile.md @@ -2,7 +2,7 @@ ## Standard procedure -1. Install git and Go ≥ 1.25. +1. Install git and Go ≥ 1.26. 2. Clone the repository, enter into the folder and start the building process: @@ -21,7 +21,7 @@ If you need to use a custom or external libcamera to interact with some Raspberr 1. Download [mediamtx-rpicamera source code](https://github.com/bluenviron/mediamtx-rpicamera) and compile it against the external libcamera. Instructions are in the repository. -2. Install git and Go ≥ 1.25. +2. Install git and Go ≥ 1.26. 3. Clone the _MediaMTX_ repository: @@ -49,7 +49,7 @@ If you need to use a custom or external libcamera to interact with some Raspberr Cross compilation allows to build an executable for a target machine from another machine with a different operating system or architecture. This is useful in case the target machine doesn't have enough resources for compilation or if you don't want to install the compilation dependencies on it. -1. On the machine you want to use to compile, install git and Go ≥ 1.25. +1. On the machine you want to use to compile, install git and Go ≥ 1.26. 2. Clone the repository, enter into the folder and start the building process: diff --git a/go.mod b/go.mod index 92169221..a34aaf6e 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/bluenviron/mediamtx -go 1.25.0 +go 1.26.0 require ( code.cloudfoundry.org/bytefmt v0.70.0 diff --git a/internal/conf/conf.go b/internal/conf/conf.go index d04e677f..0c1f90f2 100644 --- a/internal/conf/conf.go +++ b/internal/conf/conf.go @@ -52,8 +52,7 @@ func setAllNilSlicesToEmptyRecursive(rv reflect.Value) { } if rv.Kind() == reflect.Struct { - for i := range rv.NumField() { - field := rv.Field(i) + for _, field := range rv.Fields() { switch field.Kind() { case reflect.Slice: if field.IsNil() {