Skip to content

Commit

Permalink
Deprecate Go 1.21 and add 1.24 (#1055)
Browse files Browse the repository at this point in the history
* Deprecate Go 1.21 and add 1.24
* Update s2sx go.mod

Remove old docs, prep for new release.
  • Loading branch information
klauspost authored Feb 19, 2025
1 parent df8e99c commit 8e79dc4
Show file tree
Hide file tree
Showing 7 changed files with 50 additions and 113 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
build:
strategy:
matrix:
go-version: [1.21.x, 1.22.x, 1.23.x]
go-version: [1.22.x, 1.23.x, 1.24.x]
os: [ubuntu-latest, macos-latest, windows-latest]
env:
CGO_ENABLED: 0
Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5.3.0
with:
go-version: 1.23.x
go-version: 1.24.x

- name: Checkout code
uses: actions/checkout@v4
Expand All @@ -82,7 +82,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5.3.0
with:
go-version: 1.23.x
go-version: 1.24.x

- name: Checkout code
uses: actions/checkout@v4
Expand Down Expand Up @@ -125,7 +125,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5.3.0
with:
go-version: 1.23.x
go-version: 1.24.x

- name: Checkout code
uses: actions/checkout@v4
Expand All @@ -151,7 +151,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5.3.0
with:
go-version: 1.22.x
go-version: 1.24.x

- name: Checkout code
uses: actions/checkout@v4
Expand Down Expand Up @@ -182,7 +182,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5.3.0
with:
go-version: 1.23.x
go-version: 1.24.x
- name: Checkout code
uses: actions/checkout@v4

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
name: Set up Go
uses: actions/setup-go@5a083d0e9a84784eb32078397cf5459adecb4c40 # v5.2.0
with:
go-version: 1.23.x
go-version: 1.24.x
-
name: Run GoReleaser
uses: goreleaser/goreleaser-action@9ed2f89a662bf1735a48bc8557fd212fa902bebf # v6.1.0
Expand Down
129 changes: 34 additions & 95 deletions README.md

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions fse/fse_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -210,12 +210,12 @@ func TestReadNCount(t *testing.T) {
got := s2.norm[:s2.symbolLen]
if !reflect.DeepEqual(want, got) {
if s.actualTableLog != s2.actualTableLog {
t.Errorf(name+"norm table, want tablelog: %d, got %d", s.actualTableLog, s2.actualTableLog)
t.Errorf("%snorm table, want tablelog: %d, got %d", name, s.actualTableLog, s2.actualTableLog)
}
if s.symbolLen != s2.symbolLen {
t.Errorf(name+"norm table, want size: %d, got %d", s.symbolLen, s2.symbolLen)
t.Errorf("%snorm table, want size: %d, got %d", name, s.symbolLen, s2.symbolLen)
}
t.Errorf(name + "norm table, got delta: \n")
t.Errorf("%snorm table, got delta: \n", name)
return
}
for i, dec := range s2.decTable {
Expand All @@ -228,19 +228,19 @@ func TestReadNCount(t *testing.T) {
}
if dc != nil {
if len(buf0) != len(dc) {
t.Errorf(name+"decompressed, want size: %d, got %d", len(buf0), len(dc))
t.Errorf("%sdecompressed, want size: %d, got %d", name, len(buf0), len(dc))
if len(buf0) > len(dc) {
buf0 = buf0[:len(dc)]
} else {
dc = dc[:len(buf0)]
}
if !bytes.Equal(buf0, dc) {
t.Errorf(name+"decompressed, got delta: (in) %v != (out) %v\n", buf0, dc)
t.Errorf("%sdecompressed, got delta: (in) %v != (out) %v\n", name, buf0, dc)
}
return
}
if !bytes.Equal(buf0, dc) {
t.Errorf(name + "decompressed, got delta.")
t.Errorf("%sdecompressed, got delta.", name)
}
if !t.Failed() {
t.Log("... roundtrip ok!")
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/klauspost/compress

go 1.21
go 1.22

retract (
// /~https://github.com/klauspost/compress/pull/503
Expand Down
4 changes: 1 addition & 3 deletions s2/cmd/_s2sx/go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module github.com/klauspost/compress/s2/cmd/s2sx

go 1.21

toolchain go1.22.4
go 1.22

require github.com/klauspost/compress v1.11.9

Expand Down
2 changes: 1 addition & 1 deletion s2sx.mod
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module github.com/klauspost/compress

go 1.21
go 1.22

0 comments on commit 8e79dc4

Please sign in to comment.