From eca4c1c5d515d4ccb4e63dc43365654961d21bb7 Mon Sep 17 00:00:00 2001 From: Nicolas Simonds Date: Mon, 7 Oct 2024 16:24:36 -0700 Subject: [PATCH] chore: build with Go 1.23 Requires a pre-release version of avfs. --- .github/workflows/go.yml | 2 +- examples/go-client/go.mod | 4 ++-- go.mod | 4 ++-- go.sum | 4 ++-- internal/mocks/vfs/failfs.go | 5 ----- 5 files changed, 7 insertions(+), 12 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index c701f72..02acf8c 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -15,7 +15,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: '1.22' + go-version: '1.23' - name: Install Task uses: arduino/setup-task@v2 with: diff --git a/examples/go-client/go.mod b/examples/go-client/go.mod index 4101ff8..4e946ee 100644 --- a/examples/go-client/go.mod +++ b/examples/go-client/go.mod @@ -1,8 +1,8 @@ module example.com/client -go 1.22 +go 1.23 -toolchain go1.22.2 +toolchain go1.23.2 replace github.com/retr0h/gilt/v2 => ../../../gilt/ diff --git a/go.mod b/go.mod index afd8866..ea95ecd 100644 --- a/go.mod +++ b/go.mod @@ -1,9 +1,9 @@ module github.com/retr0h/gilt/v2 -go 1.22 +go 1.23 require ( - github.com/avfs/avfs v0.33.0 + github.com/avfs/avfs v0.33.1-0.20240914121800-614029c843ff github.com/caarlos0/go-version v0.1.1 github.com/danjacques/gofslock v0.0.0-20230728142113-ae8f59f9e88b github.com/go-playground/validator/v10 v10.22.1 diff --git a/go.sum b/go.sum index d4354fa..981dfe7 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -github.com/avfs/avfs v0.33.0 h1:5WQXbUbr6VS7aani39ZN2Vrd/s3wLnyih1Sc4ExWTxs= -github.com/avfs/avfs v0.33.0/go.mod h1:Q59flcFRYe9KYkNMfrLUJney3yeKGQpcWRyxsDBW7vI= +github.com/avfs/avfs v0.33.1-0.20240914121800-614029c843ff h1:kNLtLYnnDNVCJg9l41F5rSL29AdxHPRicqlVCjA+BUY= +github.com/avfs/avfs v0.33.1-0.20240914121800-614029c843ff/go.mod h1:LnzrUO5acMU5NCkohHcUN15YrnkxiJ/lRLQOZSp39ow= github.com/caarlos0/go-version v0.1.1 h1:1bikKHkGGVIIxqCmufhSSs3hpBScgHGacrvsi8FuIfc= github.com/caarlos0/go-version v0.1.1/go.mod h1:Ze5Qx4TsBBi5FyrSKVg1Ibc44KGV/llAaKGp86oTwZ0= github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= diff --git a/internal/mocks/vfs/failfs.go b/internal/mocks/vfs/failfs.go index b806c59..14fc5c3 100644 --- a/internal/mocks/vfs/failfs.go +++ b/internal/mocks/vfs/failfs.go @@ -22,7 +22,6 @@ import ( "time" "github.com/avfs/avfs" - "github.com/avfs/avfs/idm/dummyidm" ) type FailFS struct { @@ -179,10 +178,6 @@ func (vfs *FailFS) Glob(pattern string) (matches []string, err error) { return vfs.baseFS.Glob(pattern) } -func (vfs *FailFS) Idm() avfs.IdentityMgr { - return dummyidm.NotImplementedIdm -} - func (vfs *FailFS) IsAbs(path string) bool { return vfs.baseFS.IsAbs(path) }