diff --git a/.github/actions/lfs/action.yml b/.github/actions/lfs/action.yml index d135d8d..062ae96 100644 --- a/.github/actions/lfs/action.yml +++ b/.github/actions/lfs/action.yml @@ -18,4 +18,6 @@ runs: - name: Git LFS pull shell: bash - run: git lfs pull \ No newline at end of file + run: | + git lfs pull + git lfs prune \ No newline at end of file diff --git a/.github/workflows/cross.sh b/.github/workflows/cross.sh index 4676dcb..592267d 100755 --- a/.github/workflows/cross.sh +++ b/.github/workflows/cross.sh @@ -23,4 +23,5 @@ echo darwin-flock ; GOOS=darwin GOARCH=amd64 go build -tags sqlite3_flock . echo darwin-noshm ; GOOS=darwin GOARCH=amd64 go build -tags sqlite3_noshm . echo darwin-nosys ; GOOS=darwin GOARCH=amd64 go build -tags sqlite3_nosys . echo windows-nosys ; GOOS=windows GOARCH=amd64 go build -tags sqlite3_nosys . -echo freebsd-nosys ; GOOS=freebsd GOARCH=amd64 go build -tags sqlite3_nosys . \ No newline at end of file +echo freebsd-nosys ; GOOS=freebsd GOARCH=amd64 go build -tags sqlite3_nosys . +echo solaris-flock ; GOOS=solaris GOARCH=amd64 go build -tags sqlite3_flock . \ No newline at end of file diff --git a/go.work.sum b/go.work.sum index 5a6f903..4deb7b7 100644 --- a/go.work.sum +++ b/go.work.sum @@ -4,5 +4,6 @@ golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/term v0.19.0 h1:+ThwsDv+tYfnJFhF4L8jITxu1tdTWRTZpdsWgEgjL6Q= golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk= +golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= diff --git a/vfs/lock.go b/vfs/lock.go index 57bc5f9..86a988a 100644 --- a/vfs/lock.go +++ b/vfs/lock.go @@ -1,4 +1,4 @@ -//go:build (linux || darwin || windows || freebsd || openbsd || netbsd || dragonfly || illumos) && !sqlite3_nosys +//go:build (linux || darwin || windows || freebsd || openbsd || netbsd || dragonfly || illumos || sqlite3_flock) && !sqlite3_nosys package vfs diff --git a/vfs/lock_other.go b/vfs/lock_other.go index a4563af..c395f34 100644 --- a/vfs/lock_other.go +++ b/vfs/lock_other.go @@ -1,4 +1,4 @@ -//go:build !(linux || darwin || windows || freebsd || openbsd || netbsd || dragonfly || illumos) || sqlite3_nosys +//go:build !(linux || darwin || windows || freebsd || openbsd || netbsd || dragonfly || illumos || sqlite3_flock) || sqlite3_nosys package vfs diff --git a/vfs/os_unix_lock.go b/vfs/os_unix_lock.go index 9e11fd8..d04c1f6 100644 --- a/vfs/os_unix_lock.go +++ b/vfs/os_unix_lock.go @@ -1,4 +1,4 @@ -//go:build (linux || darwin || freebsd || openbsd || netbsd || dragonfly || illumos) && !sqlite3_nosys +//go:build (linux || darwin || freebsd || openbsd || netbsd || dragonfly || illumos || sqlite3_flock) && !sqlite3_nosys package vfs