diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 2bc89a8..3d6ee73 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/setup-go@v5 with: - go-version: "1.24" + go-version: "1.25" - uses: golangci/golangci-lint-action@v8 with: @@ -29,7 +29,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 cdd58ea..f8db782 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 }} @@ -35,4 +35,4 @@ jobs: steps: - uses: actions/checkout@v5 - - run: make test32 + - run: make test-32 diff --git a/Makefile b/Makefile index 7b9501a..5204e1a 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) @@ -10,7 +10,7 @@ help: @echo "" @echo " format format source files" @echo " test run tests" - @echo " test32 run tests on a 32-bit system" + @echo " test-32 run tests on a 32-bit system" @echo " lint run linter" @echo "" diff --git a/README.md b/README.md index 12f343a..0e1f8ea 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Definitions and functions shared between [gortsplib](https://github.com/bluenvir * [Bit reader and writer](https://pkg.go.dev/github.com/bluenviron/mediacommon/v2/pkg/bits) * [Rewindable reader](https://pkg.go.dev/github.com/bluenviron/mediacommon/v2/pkg/rewindablereader) -Go ≥ 1.23 is required. +Go ≥ 1.24 is required. ## Specifications diff --git a/go.mod b/go.mod index 5507fec..6793a4f 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/bluenviron/mediacommon/v2 -go 1.23.0 +go 1.24.0 require ( github.com/abema/go-mp4 v1.4.1 diff --git a/scripts/test.mk b/scripts/test.mk index c7dd47a..a49ee7b 100644 --- a/scripts/test.mk +++ b/scripts/test.mk @@ -10,7 +10,7 @@ test-nodocker: test-pkg define DOCKERFILE_TEST ARG ARCH -FROM $$ARCH/$(BASE_IMAGE) +FROM --platform=$$ARCH $(BASE_IMAGE) RUN apk add --no-cache make git gcc musl-dev WORKDIR /s COPY go.mod go.sum ./ @@ -26,7 +26,7 @@ test: temp \ make test-nodocker -test32: +test-32: echo "$$DOCKERFILE_TEST" | docker build -q . -f - -t temp --build-arg ARCH=i386 docker run --rm \ --name temp \