Skip to content

Commit def2add

Browse files
authored
Merge pull request #74 from zalando/freebsd-cgo-disabled
Test building on freebsd with cgo disabled
2 parents 7f07573 + 5d9f194 commit def2add

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

.github/workflows/go.yml

+7-1
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,14 @@ jobs:
8787
id: test
8888
uses: vmactions/[email protected]
8989
with:
90+
usesh: true
9091
prepare: pkg install -y go gnome-keyring
9192
run: |
9293
go version
93-
go build -v ./...
94+
go build -v
9495
dbus-run-session -- sh -c "echo 'somecredstorepass' | gnome-keyring-daemon --unlock; go test -v ./..."
96+
# verify that we can build for freebsd with cgo disabled
97+
# This will disable the functionality as it depends on cgo (via
98+
# godbus) but should still be buildable to not break backwards
99+
# compatibility
100+
CGO_ENABLED=0 go build -v

keyring_unix.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
//go:build dragonfly || freebsd || linux || netbsd || openbsd
2-
// +build dragonfly freebsd linux netbsd openbsd
1+
//go:build (dragonfly && cgo) || (freebsd && cgo) || linux || netbsd || openbsd
32

43
package keyring
54

0 commit comments

Comments
 (0)