Skip to content

Commit f6ad619

Browse files
authored
chore(build): Bump dependency, golangci-lint, and use unsafe.Slice (#105)
Signed-off-by: Rajiv Singh <[email protected]>
1 parent 5fa86be commit f6ad619

File tree

6 files changed

+20
-19
lines changed

6 files changed

+20
-19
lines changed

.github/workflows/build.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ concurrency:
1515

1616
env:
1717
# renovate: datasource=go depName=github.com/golangci/golangci-lint
18-
GOLANGCI_LINT_VERSION: v1.52.2
18+
GOLANGCI_LINT_VERSION: v1.60
1919

2020
jobs:
2121
spellcheck:
2222
name: Spell Check
2323
runs-on: ubuntu-latest
2424
steps:
2525
- name: Checkout Actions Repository
26-
uses: actions/checkout@v2
26+
uses: actions/checkout@v4
2727

2828
- name: Check spelling of Go files
2929
uses: crate-ci/typos@master
@@ -36,17 +36,17 @@ jobs:
3636
runs-on: ubuntu-latest
3737
timeout-minutes: 30
3838
steps:
39-
- uses: actions/checkout@v3
39+
- uses: actions/checkout@v4
4040

4141
- name: Set up Go
42-
uses: actions/setup-go@v3
42+
uses: actions/setup-go@v5
4343
with:
4444
go-version-file: .go-version
4545
check-latest: true
4646
cache: true
4747

4848
- name: golangci-lint
49-
uses: golangci/golangci-lint-action@v3
49+
uses: golangci/golangci-lint-action@v6
5050
with:
5151
version: ${{ env.GOLANGCI_LINT_VERSION }}
5252
args: --timeout 5m
@@ -55,10 +55,10 @@ jobs:
5555
name: Go Test
5656
runs-on: ubuntu-latest
5757
steps:
58-
- uses: actions/checkout@v3
58+
- uses: actions/checkout@v4
5959

6060
- name: Set up Go
61-
uses: actions/setup-go@v3
61+
uses: actions/setup-go@v5
6262
with:
6363
go-version-file: .go-version
6464
check-latest: true

.github/workflows/release.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@ jobs:
1515
goreleaser:
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1919
with:
2020
fetch-depth: 0
2121

22-
- uses: actions/setup-go@v4
22+
- uses: actions/setup-go@v5
2323
with:
2424
go-version-file: .go-version
2525
# More assembly might be required: Docker logins, GPG, etc. It all depends
2626
# on your needs.
27-
- uses: goreleaser/goreleaser-action@v4
27+
- uses: goreleaser/goreleaser-action@v6
2828
with:
2929
# either 'goreleaser' (default) or 'goreleaser-pro':
3030
distribution: goreleaser

.go-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.20.4
1+
1.22

.golangci.yml

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
run:
22
deadline: 7m
33
timeout: 5m
4-
go: '1.20'
4+
go: '1.22'
55

66
linters:
77
enable:
@@ -19,9 +19,12 @@ issues:
1919

2020
linters-settings:
2121
depguard:
22-
list-type: blacklist
23-
include-go-root: true
24-
packages-with-error-message: []
22+
rules:
23+
main:
24+
list-mode: lax
25+
deny:
26+
- pkg: github.com/pkg/errors
27+
desc: 'Use errors or fmt instead of github.com/pkg/errors'
2528
errcheck:
2629
goimports:
2730
local-prefixes: github.com/stealthrocket/wzprof

.goreleaser.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ builds:
1313
- amd64
1414
- arm64
1515
ldflags:
16-
- -X main.version={{.Version}}
16+
- -X main.version={{.Version}}
1717

1818
release:
1919
github:

memory.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ package wzprof
44

55
import (
66
"fmt"
7-
"reflect"
87
"unsafe"
98
)
109

@@ -85,8 +84,7 @@ func derefArray[T any](r vmem, p ptr, n uint32) []T {
8584
// 64-bits.
8685
func derefGoSlice[T any](r vmem, s []T) []T {
8786
count := len(s)
88-
sh := (*reflect.SliceHeader)(unsafe.Pointer(&s))
89-
dp := ptr64(sh.Data)
87+
dp := ptr64(uintptr(unsafe.Pointer(unsafe.SliceData(s)))) // Convert to uintptr first, then to ptr64
9088
res := make([]T, count)
9189
for i := 0; i < count; i++ {
9290
res[i] = derefArrayIndex[T](r, dp, int32(i))

0 commit comments

Comments
 (0)