From 90bbb1c512b8c0f955d5ea48cea08967b5b9f5ac Mon Sep 17 00:00:00 2001 From: Jeff Stafford Date: Sat, 20 Apr 2024 18:08:38 -0400 Subject: [PATCH] add build tags for ci --- .github/workflows/ci.yml | 12 ++++++------ go.mod | 2 +- go.sum | 2 ++ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dc882c5..968e0d1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -63,12 +63,12 @@ jobs: # cannot run systemd tests here because github actions runners don't have dbus setup + # if CGO is on, the UI tests will take foreverrrrr bash cgo-helper.sh - CGO_ENABLED=0 gotest -v -covermode=count -coverpkg=./ui/... -coverprofile=ui.coverage ./ui - gotest -v -covermode=count -coverpkg=./cmd/common -coverprofile=common.coverage ./cmd/common - gotest -v -covermode=count -coverpkg=./fs/... -coverprofile=quickxorhash.coverage ./fs/graph/quickxorhash - gotest -v -covermode=count -coverpkg=./fs/... -coverprofile=graph.coverage ./fs/graph - gotest -v -covermode=count -coverpkg=./fs/... -coverprofile=fs.coverage ./fs - go test -c -covermode=count -coverpkg=./fs/... ./fs/offline + CGO_ENABLED=0 gotest -v -tags=glib_2_64 -covermode=count -coverpkg=./ui/... -coverprofile=ui.coverage ./ui + gotest -v -tags=glib_2_64 -covermode=count -coverpkg=./cmd/common -coverprofile=common.coverage ./cmd/common + gotest -v -tags=glib_2_64 -covermode=count -coverpkg=./fs/... -coverprofile=quickxorhash.coverage ./fs/graph/quickxorhash + gotest -v -tags=glib_2_64 -covermode=count -coverpkg=./fs/... -coverprofile=graph.coverage ./fs/graph + gotest -v -tags=glib_2_64 -covermode=count -coverpkg=./fs/... -coverprofile=fs.coverage ./fs + go test -c -tags=glib_2_64 -covermode=count -coverpkg=./fs/... ./fs/offline sudo unshare -n -S $(id -u) -G $(id -g) ./offline.test -test.v -test.coverprofile=offline.coverage - name: Copy new auth tokens to S3 diff --git a/go.mod b/go.mod index 2982a74..91eea23 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/jstaf/onedriver require ( github.com/coreos/go-systemd/v22 v22.3.2 github.com/godbus/dbus/v5 v5.0.6 - github.com/gotk3/gotk3 v0.6.2 + github.com/gotk3/gotk3 v0.6.3 github.com/hanwen/go-fuse/v2 v2.4.2 github.com/imdario/mergo v0.3.13 github.com/rs/zerolog v1.26.1 diff --git a/go.sum b/go.sum index 3697dad..65c2e9e 100644 --- a/go.sum +++ b/go.sum @@ -7,6 +7,8 @@ github.com/godbus/dbus/v5 v5.0.6 h1:mkgN1ofwASrYnJ5W6U/BxG15eXXXjirgZc7CLqkcaro= github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gotk3/gotk3 v0.6.2 h1:sx/PjaKfKULJPTPq8p2kn2ZbcNFxpOJqi4VLzMbEOO8= github.com/gotk3/gotk3 v0.6.2/go.mod h1:/hqFpkNa9T3JgNAE2fLvCdov7c5bw//FHNZrZ3Uv9/Q= +github.com/gotk3/gotk3 v0.6.3 h1:+Ke4WkM1TQUNOlM2TZH6szqknqo+zNbX3BZWVXjSHYw= +github.com/gotk3/gotk3 v0.6.3/go.mod h1:/hqFpkNa9T3JgNAE2fLvCdov7c5bw//FHNZrZ3Uv9/Q= github.com/hanwen/go-fuse/v2 v2.4.2 h1:ujevavwvGMg4s1TTSGWqid0q7WHk0XC8EOzHtygnt9E= github.com/hanwen/go-fuse/v2 v2.4.2/go.mod h1:xKwi1cF7nXAOBCXujD5ie0ZKsxc8GGSA1rlMJc+8IJs= github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk=