Skip to content

Commit

Permalink
Merge pull request #319 from rusq/i318
Browse files Browse the repository at this point in the history
Fix test for go1.23, and bump go version
  • Loading branch information
rusq committed Aug 27, 2024
2 parents 0c9e59e + b0f231b commit eff22d0
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 8 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Set up Go
uses: actions/setup-go@v2
uses: actions/setup-go@v5
with:
go-version: "1.21"
go-version: "1.23"

- name: Build
run: go build -v ./...
Expand All @@ -25,5 +25,8 @@ jobs:
run: |
BASE_DIR="contrib" go run ./contrib/_gen -v
- name: AUR build test
run: make aurtest

- name: Test
run: make test
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- run: git fetch --force --tags
- uses: actions/setup-go@v5
with:
go-version: '>=1.19.5'
go-version: '>=1.23.0'
cache: true
# More assembly might be required: Docker logins, GPG, etc. It all depends
# on your needs.
Expand Down
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ clean:

test:
go test -race -cover -count=3 ./...
aurtest:
GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw" go build -o 'deleteme' ./cmd/...
rm deleteme
.PHONY: aurtest

docker_test:
docker build .
Expand Down
2 changes: 1 addition & 1 deletion auth/auth_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ func TestSave(t *testing.T) {
args{ValueAuth{simpleProvider{Token: "token_value", Cookie: []*http.Cookie{
{Name: "d", Value: "abc"},
}}}},
`{"Token":"token_value","Cookie":[{"Name":"d","Value":"abc","Path":"","Domain":"","Expires":"0001-01-01T00:00:00Z","RawExpires":"","MaxAge":0,"Secure":false,"HttpOnly":false,"SameSite":0,"Raw":"","Unparsed":null}]}` + "\n",
`{"Token":"token_value","Cookie":[{"Name":"d","Value":"abc","Quoted":false,"Path":"","Domain":"","Expires":"0001-01-01T00:00:00Z","RawExpires":"","MaxAge":0,"Secure":false,"HttpOnly":false,"SameSite":0,"Partitioned":false,"Raw":"","Unparsed":null}]}` + "\n",
false,
},
{
Expand Down
4 changes: 1 addition & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module github.com/rusq/slackdump/v2

go 1.22

toolchain go1.22.1
go 1.23

require (
github.com/MercuryEngineering/CookieMonster v0.0.0-20180304172713-1584578b3403
Expand Down

0 comments on commit eff22d0

Please sign in to comment.