Skip to content

Commit 22ab8b9

Browse files
authored
Update versions & releaser (#155)
* Update versions & releaser
1 parent 88f6499 commit 22ab8b9

File tree

6 files changed

+15
-31
lines changed

6 files changed

+15
-31
lines changed

.github/workflows/go.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
build:
1111
strategy:
1212
matrix:
13-
go-version: [1.20.x, 1.21.x, 1.22.x]
13+
go-version: [1.22.x, 1.23.x, 1.24.x]
1414
os: [ubuntu-latest, macos-latest, windows-latest]
1515
runs-on: ubuntu-latest
1616
steps:
@@ -38,7 +38,7 @@ jobs:
3838
- name: Set up Go
3939
uses: actions/setup-go@v4
4040
with:
41-
go-version: 1.22.x
41+
go-version: stable
4242

4343
- name: Checkout code
4444
uses: actions/checkout@v4
@@ -50,8 +50,7 @@ jobs:
5050
run: GOOS=linux GOARCH=386 go test -short ./...
5151

5252
- name: goreleaser deprecation
53-
run: curl -sfL https://git.io/goreleaser | VERSION=v1.9.2 sh -s -- check
53+
run: curl -sfL https://git.io/goreleaser | VERSION=v2.3.2 sh -s -- check
5454

5555
- name: goreleaser snapshot
56-
run: curl -sL https://git.io/goreleaser | VERSION=v1.9.2 sh -s -- --snapshot --skip-publish --rm-dist
57-
56+
run: curl -sL https://git.io/goreleaser | VERSION=v2.3.2 sh -s -- --snapshot --clean

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ jobs:
1818
name: Set up Go
1919
uses: actions/setup-go@v4
2020
with:
21-
go-version: 1.22.x
21+
go-version: 1.24.x
2222
-
2323
name: Run GoReleaser
2424
uses: goreleaser/goreleaser-action@v5
2525
with:
26-
version: v1.9.2
27-
args: release --rm-dist
26+
version: 2.3.2
27+
args: release --clean
2828
env:
2929
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3030
CGO_ENABLED: 0

.goreleaser.yml

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
# This is an example goreleaser.yaml file with some sane defaults.
2-
# Make sure to check the documentation at http://goreleaser.com
1+
version: 2
32

43
builds:
54
-
@@ -27,25 +26,14 @@ builds:
2726
archives:
2827
-
2928
id: cpuid
30-
name_template: "cpuid-{{ .Os }}_{{ .Arch }}_{{ .Version }}"
31-
replacements:
32-
aix: AIX
33-
darwin: OSX
34-
linux: Linux
35-
windows: Windows
36-
386: i386
37-
amd64: x86_64
38-
freebsd: FreeBSD
39-
netbsd: NetBSD
29+
name_template: "cpuid-{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}"
4030
format_overrides:
4131
- goos: windows
4232
format: zip
4333
files:
4434
- LICENSE
4535
checksum:
4636
name_template: 'checksums.txt'
47-
snapshot:
48-
name_template: "{{ .Tag }}-next"
4937
changelog:
5038
sort: asc
5139
filters:
@@ -58,7 +46,7 @@ changelog:
5846

5947
nfpms:
6048
-
61-
file_name_template: "cpuid_package_{{ .Version }}_{{ .Os }}_{{ .Arch }}"
49+
file_name_template: "cpuid_package_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}"
6250
vendor: Klaus Post
6351
homepage: https://github.com/klauspost/cpuid
6452
maintainer: Klaus Post <klauspost@gmail.com>
@@ -67,8 +55,3 @@ nfpms:
6755
formats:
6856
- deb
6957
- rpm
70-
replacements:
71-
darwin: Darwin
72-
linux: Linux
73-
freebsd: FreeBSD
74-
amd64: x86_64

cpuid.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@ func (c CPUInfo) Ia32TscAux() uint32 {
538538
return ecx
539539
}
540540

541-
// SveLengths returns arm SVE vector and predicate lengths.
541+
// SveLengths returns arm SVE vector and predicate lengths in bits.
542542
// Will return 0, 0 if SVE is not enabled or otherwise unable to detect.
543543
func (c CPUInfo) SveLengths() (vl, pl uint64) {
544544
if !c.Has(SVE) {

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module github.com/klauspost/cpuid/v2
22

3-
go 1.20
3+
go 1.22
44

5-
require golang.org/x/sys v0.22.0
5+
require golang.org/x/sys v0.30.0

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
22
golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
3+
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
4+
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=

0 commit comments

Comments
 (0)