diff --git a/.github/fetch-scripts.sh b/.github/fetch-scripts.sh index 16b1338..b453348 100755 --- a/.github/fetch-scripts.sh +++ b/.github/fetch-scripts.sh @@ -16,7 +16,7 @@ set -eu SCRIPT_PATH="$(realpath "$(dirname "$0")")" GOASSETS_PATH="${SCRIPT_PATH}/.goassets" -GOASSETS_REF=${GOASSETS_REF:-master} +GOASSETS_REF=${GOASSETS_REF:-main} if [ -d "${GOASSETS_PATH}" ]; then if ! git -C "${GOASSETS_PATH}" diff --exit-code; then diff --git a/.github/workflows/api.yaml b/.github/workflows/api.yaml index d4052c6..44258a6 100644 --- a/.github/workflows/api.yaml +++ b/.github/workflows/api.yaml @@ -17,4 +17,4 @@ on: jobs: check: - uses: pion/.goassets/.github/workflows/api.reusable.yml@master + uses: pion/.goassets/.github/workflows/api.reusable.yml@main diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index f825e2e..8ae63de 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -19,10 +19,10 @@ on: - cron: '23 5 * * 0' pull_request: branches: - - master + - main paths: - '**.go' jobs: analyze: - uses: pion/.goassets/.github/workflows/codeql-analysis.reusable.yml@master + uses: pion/.goassets/.github/workflows/codeql-analysis.reusable.yml@main diff --git a/.github/workflows/fuzz.yaml b/.github/workflows/fuzz.yaml index cd43c19..9e15a48 100644 --- a/.github/workflows/fuzz.yaml +++ b/.github/workflows/fuzz.yaml @@ -15,13 +15,13 @@ name: Fuzz on: push: branches: - - master + - main schedule: - cron: "0 */8 * * *" jobs: fuzz: - uses: pion/.goassets/.github/workflows/fuzz.reusable.yml@master + uses: pion/.goassets/.github/workflows/fuzz.reusable.yml@main with: go-version: "1.25" # auto-update/latest-go-version fuzz-time: "60s" diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 0966ef1..47a64f8 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -17,4 +17,6 @@ on: jobs: lint: - uses: pion/.goassets/.github/workflows/lint.reusable.yml@master + uses: pion/.goassets/.github/workflows/lint.reusable.yml@main + with: + golangci-lint-version: v2.10.1 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fe0d389..7487361 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,6 +19,6 @@ on: jobs: release: - uses: pion/.goassets/.github/workflows/release.reusable.yml@master + uses: pion/.goassets/.github/workflows/release.reusable.yml@main with: go-version: "1.25" # auto-update/latest-go-version diff --git a/.github/workflows/renovate-go-sum-fix.yaml b/.github/workflows/renovate-go-sum-fix.yaml index 28cf9e2..17834a2 100644 --- a/.github/workflows/renovate-go-sum-fix.yaml +++ b/.github/workflows/renovate-go-sum-fix.yaml @@ -19,6 +19,6 @@ on: jobs: fix: - uses: pion/.goassets/.github/workflows/renovate-go-sum-fix.reusable.yml@master + uses: pion/.goassets/.github/workflows/renovate-go-sum-fix.reusable.yml@main secrets: token: ${{ secrets.PIONBOT_PRIVATE_KEY }} diff --git a/.github/workflows/reuse.yml b/.github/workflows/reuse.yml index 3dfd683..d004a94 100644 --- a/.github/workflows/reuse.yml +++ b/.github/workflows/reuse.yml @@ -19,4 +19,4 @@ on: jobs: lint: - uses: pion/.goassets/.github/workflows/reuse.reusable.yml@master + uses: pion/.goassets/.github/workflows/reuse.reusable.yml@main diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 6e34f4f..4bf6180 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -15,12 +15,12 @@ name: Test on: push: branches: - - master + - main pull_request: jobs: test: - uses: pion/.goassets/.github/workflows/test.reusable.yml@master + uses: pion/.goassets/.github/workflows/test.reusable.yml@main strategy: matrix: go: ["1.25", "1.24"] # auto-update/supported-go-version-list @@ -30,7 +30,7 @@ jobs: secrets: inherit test-i386: - uses: pion/.goassets/.github/workflows/test-i386.reusable.yml@master + uses: pion/.goassets/.github/workflows/test-i386.reusable.yml@main strategy: matrix: go: ["1.25", "1.24"] # auto-update/supported-go-version-list @@ -39,7 +39,7 @@ jobs: go-version: ${{ matrix.go }} test-windows: - uses: pion/.goassets/.github/workflows/test-windows.reusable.yml@master + uses: pion/.goassets/.github/workflows/test-windows.reusable.yml@main strategy: matrix: go: ["1.25", "1.24"] # auto-update/supported-go-version-list @@ -48,7 +48,7 @@ jobs: go-version: ${{ matrix.go }} test-macos: - uses: pion/.goassets/.github/workflows/test-macos.reusable.yml@master + uses: pion/.goassets/.github/workflows/test-macos.reusable.yml@main strategy: matrix: go: ["1.25", "1.24"] # auto-update/supported-go-version-list @@ -57,7 +57,7 @@ jobs: go-version: ${{ matrix.go }} test-wasm: - uses: pion/.goassets/.github/workflows/test-wasm.reusable.yml@master + uses: pion/.goassets/.github/workflows/test-wasm.reusable.yml@main with: go-version: "1.25" # auto-update/latest-go-version secrets: inherit diff --git a/.github/workflows/tidy-check.yaml b/.github/workflows/tidy-check.yaml index f2c3538..347a25c 100644 --- a/.github/workflows/tidy-check.yaml +++ b/.github/workflows/tidy-check.yaml @@ -16,10 +16,10 @@ on: pull_request: push: branches: - - master + - main jobs: tidy: - uses: pion/.goassets/.github/workflows/tidy-check.reusable.yml@master + uses: pion/.goassets/.github/workflows/tidy-check.reusable.yml@main with: go-version: "1.25" # auto-update/latest-go-version diff --git a/.golangci.yml b/.golangci.yml index 43af4c3..6c7ceed 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -41,6 +41,7 @@ linters: - maintidx # maintidx measures the maintainability index of each function. - makezero # Finds slice declarations with non-zero initial length - misspell # Finds commonly misspelled English words in comments + - modernize # Replace and suggests simplifications to code - nakedret # Finds naked returns in functions greater than a specified function length - nestif # Reports deeply nested if statements - nilerr # Finds the code that returns nil even if it checks that the error is not nil. @@ -145,3 +146,6 @@ formatters: - goimports # Goimports does everything that gofmt does. Additionally it checks unused imports exclusions: generated: lax +issues: + max-issues-per-linter: 0 + max-same-issues: 0 \ No newline at end of file diff --git a/unmarshal.go b/unmarshal.go index b423437..2f011a8 100644 --- a/unmarshal.go +++ b/unmarshal.go @@ -877,7 +877,7 @@ func unmarshalMediaDescription(lex *lexer) (stateFn, error) { //nolint:cyclop // Set according to currently registered with IANA // https://tools.ietf.org/html/rfc4566#section-5.14 // https://tools.ietf.org/html/rfc4975#section-8.1 - for _, proto := range strings.Split(field, "/") { + for proto := range strings.SplitSeq(field, "/") { if !anyOf( proto, "UDP", diff --git a/unmarshal_test.go b/unmarshal_test.go index 6310bfc..2e0ada7 100644 --- a/unmarshal_test.go +++ b/unmarshal_test.go @@ -343,7 +343,6 @@ func TestRoundTrip(t *testing.T) { SDP: MediaFECSDP, }, } { - test := test t.Run(test.Name, func(t *testing.T) { sd := &SessionDescription{} diff --git a/util_test.go b/util_test.go index 1f1d82c..0e2d59a 100644 --- a/util_test.go +++ b/util_test.go @@ -293,7 +293,7 @@ func TestGetCodecsForPayloadTypes(t *testing.T) { func TestNewSessionID(t *testing.T) { minVal := uint64(0x7FFFFFFFFFFFFFFF) maxVal := uint64(0) - for i := 0; i < 10000; i++ { + for range 10000 { r, err := newSessionID() assert.NoError(t, err) assert.Lessf(t, r, uint64((1<<64)-1), "Session ID must be less than 2**64-1, got %d", r)