Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update CI configs to v0.11.15 #273

Merged
merged 1 commit into from
Aug 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
uses: pion/.goassets/.github/workflows/test.reusable.yml@master
strategy:
matrix:
go: ["1.22", "1.21"] # auto-update/supported-go-version-list
go: ["1.23", "1.22"] # auto-update/supported-go-version-list
fail-fast: false
with:
go-version: ${{ matrix.go }}
Expand All @@ -33,13 +33,13 @@ jobs:
uses: pion/.goassets/.github/workflows/test-i386.reusable.yml@master
strategy:
matrix:
go: ["1.22", "1.21"] # auto-update/supported-go-version-list
go: ["1.23", "1.22"] # auto-update/supported-go-version-list
fail-fast: false
with:
go-version: ${{ matrix.go }}

test-wasm:
uses: pion/.goassets/.github/workflows/test-wasm.reusable.yml@master
with:
go-version: "1.22" # auto-update/latest-go-version
go-version: "1.23" # auto-update/latest-go-version
secrets: inherit
8 changes: 4 additions & 4 deletions .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# SPDX-FileCopyrightText: 2023 The Pion community <https://pion.ly>
# SPDX-License-Identifier: MIT

run:
timeout: 5m

linters-settings:
govet:
enable:
Expand Down Expand Up @@ -48,7 +51,7 @@ linters:
- goconst # Finds repeated strings that could be replaced by a constant
- gocritic # The most opinionated Go source code linter
- godox # Tool for detection of FIXME, TODO and other comment keywords
- goerr113 # Golang linter to check the errors handling expressions
- err113 # Golang linter to check the errors handling expressions
- gofmt # Gofmt checks whether code was gofmt-ed. By default this tool runs with -s option to check for code simplification
- gofumpt # Gofumpt checks whether code was gofumpt-ed.
- goheader # Checks is file header matches to pattern
Expand Down Expand Up @@ -83,17 +86,14 @@ linters:
- depguard # Go linter that checks if package imports are in a list of acceptable packages
- containedctx # containedctx is a linter that detects struct contained context.Context field
- cyclop # checks function and package cyclomatic complexity
- exhaustivestruct # Checks if all struct's fields are initialized
- funlen # Tool for detection of long functions
- gocyclo # Computes and checks the cyclomatic complexity of functions
- godot # Check if comments end in a period
- gomnd # An analyzer to detect magic numbers.
- ifshort # Checks that your code uses short syntax for if-statements whenever possible
- ireturn # Accept Interfaces, Return Concrete Types
- lll # Reports long lines
- maintidx # maintidx measures the maintainability index of each function.
- makezero # Finds slice declarations with non-zero initial length
- maligned # Tool to detect Go structs that would take less memory if their fields were sorted
- nakedret # Finds naked returns in functions greater than a specified function length
- nestif # Reports deeply nested if statements
- nlreturn # nlreturn checks for a new line before return and branch statements to increase code clarity
Expand Down
8 changes: 4 additions & 4 deletions pkg/gcc/gcc.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ func maxInt(a, b int) int {
return b
}

func clampInt(b, min, max int) int {
return maxInt(min, minInt(max, b))
func clampInt(b, minVal, maxVal int) int {
return maxInt(minVal, minInt(maxVal, b))
}

func clampDuration(d, min, max time.Duration) time.Duration {
return time.Duration(clampInt(int(d), int(min), int(max)))
func clampDuration(d, minVal, maxVal time.Duration) time.Duration {
return time.Duration(clampInt(int(d), int(minVal), int(maxVal)))
}
6 changes: 3 additions & 3 deletions pkg/gcc/gcc_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,10 @@ func TestClamp(t *testing.T) {
})
t.Run(fmt.Sprintf("duration/%v", i), func(t *testing.T) {
x := time.Duration(tt.x)
min := time.Duration(tt.min)
max := time.Duration(tt.max)
minVal := time.Duration(tt.min)
maxVal := time.Duration(tt.max)
expected := time.Duration(tt.expected)
assert.Equal(t, expected, clampDuration(x, min, max))
assert.Equal(t, expected, clampDuration(x, minVal, maxVal))
})
}
}
4 changes: 2 additions & 2 deletions pkg/nack/receive_log_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ func TestReceivedBuffer(t *testing.T) {
t.Fatalf("%+v", err)
}

all := func(min uint16, max uint16) []uint16 {
all := func(minVal uint16, maxVal uint16) []uint16 {
result := make([]uint16, 0)
for i := min; i != max+1; i++ {
for i := minVal; i != maxVal+1; i++ {
result = append(result, i)
}
return result
Expand Down
6 changes: 3 additions & 3 deletions pkg/stats/stats_recorder.go
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ func (r *recorder) recordIncomingRR(latestStats internalStats, pkt *rtcp.Receive
latestStats.RemoteInboundRTPStreamStats.Jitter = float64(report.Jitter) / r.clockRate

if report.Delay != 0 && report.LastSenderReport != 0 {
for i := min(r.maxLastSenderReports, len(latestStats.lastSenderReports)) - 1; i >= 0; i-- {
for i := minInt(r.maxLastSenderReports, len(latestStats.lastSenderReports)) - 1; i >= 0; i-- {
lastReport := latestStats.lastSenderReports[i]
if (lastReport&0x0000FFFFFFFF0000)>>16 == uint64(report.LastSenderReport) {
dlsr := time.Duration(float64(report.Delay) / 65536.0 * float64(time.Second))
Expand All @@ -248,7 +248,7 @@ func (r *recorder) recordIncomingXR(latestStats internalStats, pkt *rtcp.Extende
if xr, ok := report.(*rtcp.DLRRReportBlock); ok {
for _, xrReport := range xr.Reports {
if xrReport.LastRR != 0 && xrReport.DLRR != 0 {
for i := min(r.maxLastReceiverReferenceTimes, len(latestStats.lastReceiverReferenceTimes)) - 1; i >= 0; i-- {
for i := minInt(r.maxLastReceiverReferenceTimes, len(latestStats.lastReceiverReferenceTimes)) - 1; i >= 0; i-- {
lastRR := latestStats.lastReceiverReferenceTimes[i]
if (lastRR&0x0000FFFFFFFF0000)>>16 == uint64(xrReport.LastRR) {
dlrr := time.Duration(float64(xrReport.DLRR) / 65536.0 * float64(time.Second))
Expand Down Expand Up @@ -377,7 +377,7 @@ func (r *recorder) QueueOutgoingRTCP(ts time.Time, pkts []rtcp.Packet, attr inte
r.ms.Unlock()
}

func min(a, b int) int {
func minInt(a, b int) int {
if a < b {
return a
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/twcc/arrival_time_map.go
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,9 @@ func (m *packetArrivalTimeMap) adjustToSize(newSize int) {
}
m.reallocate(newCapacity)
}
if m.capacity() > max(minCapacity, newSize*4) {
if m.capacity() > maxInt(minCapacity, newSize*4) {
newCapacity := m.capacity()
for newCapacity >= 2*max(newSize, minCapacity) {
for newCapacity >= 2*maxInt(newSize, minCapacity) {
newCapacity /= 2
}
m.reallocate(newCapacity)
Expand Down
6 changes: 3 additions & 3 deletions pkg/twcc/twcc.go
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ func (c *chunk) encode() rtcp.PacketStatusChunk {
}
}

minCap := min(maxTwoBitCap, len(c.deltas))
minCap := minInt(maxTwoBitCap, len(c.deltas))
svc := &rtcp.StatusVectorChunk{
SymbolSize: rtcp.TypeTCCSymbolSizeTwoBit,
SymbolList: c.deltas[:minCap],
Expand Down Expand Up @@ -337,14 +337,14 @@ func (c *chunk) reset() {
c.hasDifferentTypes = false
}

func max(a, b int) int {
func maxInt(a, b int) int {
if a > b {
return a
}
return b
}

func min(a, b int) int {
func minInt(a, b int) int {
if a < b {
return a
}
Expand Down
Loading