diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 51daccdf..dfbbb4e0 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -18,7 +18,7 @@ jobs: - uses: actions/setup-go@v5 with: - go-version: "1.24" + go-version: "1.25" - uses: golangci/golangci-lint-action@v8 with: @@ -32,7 +32,7 @@ jobs: - uses: actions/setup-go@v5 with: - go-version: "1.24" + go-version: "1.25" - run: | go mod tidy diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 23efa050..ad05928b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-22.04 strategy: matrix: - go: ["1.23", "1.24"] + go: ["1.24", "1.25"] steps: - uses: actions/checkout@v5 @@ -24,7 +24,7 @@ jobs: - run: make test-nodocker - - if: matrix.go == '1.24' + - if: matrix.go == '1.25' uses: codecov/codecov-action@v5 with: token: ${{ secrets.CODECOV_TOKEN }} @@ -37,7 +37,7 @@ jobs: - uses: actions/setup-go@v5 with: - go-version: "1.24" + go-version: "1.25" - run: make test-e2e-nodocker diff --git a/Makefile b/Makefile index 0d64bc5b..4eb679ae 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -BASE_IMAGE = golang:1.24-alpine3.20 +BASE_IMAGE = golang:1.25-alpine3.22 LINT_IMAGE = golangci/golangci-lint:v2.4.0 .PHONY: $(shell ls) diff --git a/README.md b/README.md index 850b0bf8..893b2be0 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ RTSP client and server library for the Go programming language, written for [MediaMTX](https://github.com/bluenviron/mediamtx). -Go ≥ 1.23 is required. +Go ≥ 1.24 is required. Features: diff --git a/go.mod b/go.mod index 2aface05..aea923a0 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/bluenviron/gortsplib/v4 -go 1.23.0 +go 1.24.0 require ( github.com/bluenviron/mediacommon/v2 v2.4.1 diff --git a/scripts/test.mk b/scripts/test.mk index ac02e351..74ef27b9 100644 --- a/scripts/test.mk +++ b/scripts/test.mk @@ -16,7 +16,7 @@ test-nodocker: test-examples test-pkg test-root define DOCKERFILE_TEST ARG ARCH -FROM $$ARCH/$(BASE_IMAGE) +FROM --platform=$$ARCH $(BASE_IMAGE) RUN apk add --no-cache make git gcc musl-dev pkgconfig ffmpeg-dev WORKDIR /s COPY go.mod go.sum ./