Deprecate Go 1.21 and add 1.24 (#1055)

klauspost · web-flow · commit 8e79dc4b98d4 · 2025-02-19T10:26:03.000+01:00
* Deprecate Go 1.21 and add 1.24
* Update s2sx go.mod

Remove old docs, prep for new release.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -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
diff --git a/README.md b/README.md
diff --git a/fse/fse_test.go b/fse/fse_test.go
@@ -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 {
@@ -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!")
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/klauspost/compress
 
-go 1.21
+go 1.22
 
 retract (
 	// https://github.com/klauspost/compress/pull/503
diff --git a/s2/cmd/_s2sx/go.mod b/s2/cmd/_s2sx/go.mod
@@ -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
 
diff --git a/s2sx.mod b/s2sx.mod
@@ -1,3 +1,3 @@
 module github.com/klauspost/compress
 
-go 1.21
+go 1.22

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ jobs:`
`21`	`21`	`name: Set up Go`
`22`	`22`	`uses: actions/setup-go@5a083d0e9a84784eb32078397cf5459adecb4c40 # v5.2.0`
`23`	`23`	`with:`
`24`		`- go-version: 1.23.x`
	`24`	`+ go-version: 1.24.x`
`25`	`25`	`-`
`26`	`26`	`name: Run GoReleaser`
`27`	`27`	`uses: goreleaser/goreleaser-action@9ed2f89a662bf1735a48bc8557fd212fa902bebf # v6.1.0`
Original file line number	Diff line number	Diff line change
`@@ -210,12 +210,12 @@ func TestReadNCount(t *testing.T) {`
`210`	`210`	`got := s2.norm[:s2.symbolLen]`
`211`	`211`	`if !reflect.DeepEqual(want, got) {`
`212`	`212`	`if s.actualTableLog != s2.actualTableLog {`
`213`		`- t.Errorf(name+"norm table, want tablelog: %d, got %d", s.actualTableLog, s2.actualTableLog)`
	`213`	`+ t.Errorf("%snorm table, want tablelog: %d, got %d", name, s.actualTableLog, s2.actualTableLog)`
`214`	`214`	`}`
`215`	`215`	`if s.symbolLen != s2.symbolLen {`
`216`		`- t.Errorf(name+"norm table, want size: %d, got %d", s.symbolLen, s2.symbolLen)`
	`216`	`+ t.Errorf("%snorm table, want size: %d, got %d", name, s.symbolLen, s2.symbolLen)`
`217`	`217`	`}`
`218`		`- t.Errorf(name + "norm table, got delta: \n")`
	`218`	`+ t.Errorf("%snorm table, got delta: \n", name)`
`219`	`219`	`return`
`220`	`220`	`}`
`221`	`221`	`for i, dec := range s2.decTable {`
`@@ -228,19 +228,19 @@ func TestReadNCount(t *testing.T) {`
`228`	`228`	`}`
`229`	`229`	`if dc != nil {`
`230`	`230`	`if len(buf0) != len(dc) {`
`231`		`- t.Errorf(name+"decompressed, want size: %d, got %d", len(buf0), len(dc))`
	`231`	`+ t.Errorf("%sdecompressed, want size: %d, got %d", name, len(buf0), len(dc))`
`232`	`232`	`if len(buf0) > len(dc) {`
`233`	`233`	`buf0 = buf0[:len(dc)]`
`234`	`234`	`} else {`
`235`	`235`	`dc = dc[:len(buf0)]`
`236`	`236`	`}`
`237`	`237`	`if !bytes.Equal(buf0, dc) {`
`238`		`- t.Errorf(name+"decompressed, got delta: (in) %v != (out) %v\n", buf0, dc)`
	`238`	`+ t.Errorf("%sdecompressed, got delta: (in) %v != (out) %v\n", name, buf0, dc)`
`239`	`239`	`}`
`240`	`240`	`return`
`241`	`241`	`}`
`242`	`242`	`if !bytes.Equal(buf0, dc) {`
`243`		`- t.Errorf(name + "decompressed, got delta.")`
	`243`	`+ t.Errorf("%sdecompressed, got delta.", name)`
`244`	`244`	`}`
`245`	`245`	`if !t.Failed() {`
`246`	`246`	`t.Log("... roundtrip ok!")`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`module github.com/klauspost/compress`
`2`	`2`
`3`		`-go 1.21`
	`3`	`+go 1.22`