Merge pull request #74 from zalando/freebsd-cgo-disabled

Test building on freebsd with cgo disabled
zalando · Mar 21, 2022 · def2add · Luckyfive · Mar 22, 2022 · mikkeloscar
2 parents 7f07573 + 5d9f194
commit def2add
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -87,8 +87,14 @@ jobs:
       id: test
       uses: vmactions/freebsd-vm@v0.1.6
       with:
+        usesh: true
         prepare: pkg install -y go gnome-keyring
         run: |
           go version
-          go build -v ./...
+          go build -v
           dbus-run-session -- sh -c "echo 'somecredstorepass' | gnome-keyring-daemon --unlock; go test -v ./..."
+          # verify that we can build for freebsd with cgo disabled
+          # This will disable the functionality as it depends on cgo (via
+          # godbus) but should still be buildable to not break backwards
+          # compatibility
+          CGO_ENABLED=0 go build -v
diff --git a/keyring_unix.go b/keyring_unix.go
@@ -1,5 +1,4 @@
-//go:build dragonfly || freebsd || linux || netbsd || openbsd
-// +build dragonfly freebsd linux netbsd openbsd
+//go:build (dragonfly && cgo) || (freebsd && cgo) || linux || netbsd || openbsd
 
 package keyring