Skip to content

Commit

Permalink
chore: switch CI to go 1.22 & golangci-lint 1.55.2
Browse files Browse the repository at this point in the history
Signed-off-by: Maxime Soulé <btik-git@scoubidou.com>
  • Loading branch information
maxatome committed Feb 7, 2024
1 parent 39ed85b commit c72d04a
Show file tree
Hide file tree
Showing 5 changed files with 258 additions and 246 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Expand Up @@ -11,10 +11,10 @@ jobs:
test:
strategy:
matrix:
go-version: [1.13.x, 1.14.x, 1.15.x, 1.16.x, 1.17.x, 1.18.x, 1.19.x, 1.20.x, tip]
go-version: [1.13.x, 1.14.x, 1.15.x, 1.16.x, 1.17.x, 1.18.x, 1.19.x, 1.20.x, 1.21.x, tip]
full-tests: [false]
include:
- go-version: 1.21.x
- go-version: 1.22.x
full-tests: true

runs-on: ubuntu-latest
Expand All @@ -32,7 +32,7 @@ jobs:
if: matrix.full-tests
run: |
curl -sL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh |
sh -s -- -b $HOME/go/bin v1.54.1
sh -s -- -b $HOME/go/bin v1.55.2
$HOME/go/bin/golangci-lint run --max-issues-per-linter 0 \
--max-same-issues 0 \
--exclude="unused-parameter: parameter '[^']+' seems to be unused, consider removing or renaming it as _" \
Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -4,7 +4,7 @@ Easy mocking of http responses from external resources.

## Install

Currently supports Go 1.13 to 1.21 and is regularly tested against tip.
Currently supports Go 1.13 to 1.22 and is regularly tested against tip.

`v1` branch has to be used instead of `master`.

Expand Down
4 changes: 2 additions & 2 deletions race_test.go
Expand Up @@ -5,7 +5,7 @@ import (
"sync"
"testing"

. "github.com/jarcoal/httpmock"
"github.com/jarcoal/httpmock"
)

func TestActivateNonDefaultRace(t *testing.T) {
Expand All @@ -14,7 +14,7 @@ func TestActivateNonDefaultRace(t *testing.T) {
for i := 0; i < 10; i++ {
go func() {
defer wg.Done()
ActivateNonDefault(&http.Client{})
httpmock.ActivateNonDefault(&http.Client{})
}()
}
wg.Wait()
Expand Down

0 comments on commit c72d04a

Please sign in to comment.