Merge branch 'main' into issue/86

georg · web-flow · commit 516fc7ab1357 · 2025-10-14T18:27:46.000+11:00
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -2,7 +2,7 @@ name: CodeQL
 
 on:
   push:
-    branches: [ "master", "main" ]
+    branches: [ "main" ]
   pull_request:
   schedule:
     - cron: '00 5 * * 1'
@@ -21,15 +21,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: [ 'go' ]
+        language: [ 'go', 'actions' ]
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
+        uses: github/codeql-action/init@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.29.5
         with:
           languages: ${{ matrix.language }}
           # xref: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
@@ -40,6 +40,6 @@ jobs:
         run: go build ./...
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
+        uses: github/codeql-action/analyze@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.29.5
         with:
           category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
@@ -25,12 +25,12 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
+        uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a # v2.4.3
         with:
           results_file: results.sarif
           results_format: sarif
@@ -57,6 +57,6 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
+        uses: github/codeql-action/upload-sarif@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.29.5
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -10,15 +10,15 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.22.x,1.23.x,1.24.x]
+        go-version: [1.24.x,1.25.x]
         platform: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.platform }}
     steps:
     - name: Checkout code
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
     - name: Install Go
-      uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
+      uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
       with:
         go-version: ${{ matrix.go-version }}
 
diff --git a/.github/workflows/test_wasip1.yml b/.github/workflows/test_wasip1.yml
@@ -2,7 +2,7 @@ name: Test wasip1
 
 on:
   push:
-    branches: [ "master", "main" ]
+    branches: [ "main" ]
   pull_request:
 
 permissions: {}
@@ -11,20 +11,20 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.23.x,1.24.x]
+        go-version: [1.24.x,1.25.x]
     runs-on: ubuntu-latest
     steps:
     - name: Checkout code
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
     - name: Install Go
-      uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
+      uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
       with:
         go-version: ${{ matrix.go-version }}
 
     - name: Install wasirun
       run: |
-        go install github.com/stealthrocket/wasi-go/cmd/wasirun@latest
+        go install github.com/stealthrocket/wasi-go/cmd/wasirun@v0.8.0
 
     - name: Test
       run: make wasitest
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -1,5 +1,6 @@
+version: "2"
 linters:
-  disable-all: true
+  default: none
   enable:
     - asasalint
     - asciicheck
@@ -22,10 +23,8 @@ linters:
     - gochecknoinits
     - gochecksumtype
     - goheader
-    - goimports
     - gomodguard
     - goprintffuncname
-    - gosimple
     - gosmopolitan
     - govet
     - grouper
@@ -44,14 +43,33 @@ linters:
     - sloglint
     - spancheck
     - sqlclosecheck
+    - staticcheck
     - tagalign
     - tagliatelle
-    - tenv
     - testableexamples
-    - typecheck
     - unconvert
     - unused
     - usestdlibvars
     - wastedassign
     - whitespace
     - zerologlint
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@ GOCMD = go
 GOTEST = $(GOCMD) test 
 WASIRUN_WRAPPER := $(CURDIR)/scripts/wasirun-wrapper
 
-GOLANGCI_VERSION ?= v1.64.5
+GOLANGCI_VERSION ?= v2.1.6
 TOOLS_BIN := $(shell mkdir -p build/tools && realpath build/tools)
 
 GOLANGCI = $(TOOLS_BIN)/golangci-lint-$(GOLANGCI_VERSION)
@@ -14,7 +14,7 @@ $(GOLANGCI):
 
 .PHONY: test
 test:
-	$(GOTEST) -race -timeout 300s ./...
+	$(GOTEST) -race -timeout 900s ./...
 
 test-coverage:
 	echo "" > $(COVERAGE_REPORT); \
diff --git a/go.mod b/go.mod
@@ -1,12 +1,12 @@
 module github.com/go-git/go-billy/v6
 
 // go-git supports the last 3 stable Go versions.
-go 1.22
+go 1.24.0
 
 require (
-	github.com/cyphar/filepath-securejoin v0.4.1
-	github.com/stretchr/testify v1.10.0
-	golang.org/x/sys v0.30.0
+	github.com/cyphar/filepath-securejoin v0.5.0
+	github.com/stretchr/testify v1.11.1
+	golang.org/x/sys v0.37.0
 )
 
 require (
diff --git a/go.sum b/go.sum
@@ -1,13 +1,13 @@
-github.com/cyphar/filepath-securejoin v0.4.1 h1:JyxxyPEaktOD+GAnqIqTf9A8tHyAG22rowi7HkoSU1s=
-github.com/cyphar/filepath-securejoin v0.4.1/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGLDGQL7h7bg04C/+u9jI=
+github.com/cyphar/filepath-securejoin v0.5.0 h1:hIAhkRBMQ8nIeuVwcAoymp7MY4oherZdAxD+m0u9zaw=
+github.com/cyphar/filepath-securejoin v0.5.0/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGLDGQL7h7bg04C/+u9jI=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
-github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
-golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
+github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
+golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ=
+golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
diff --git a/memfs/file.go b/memfs/file.go
@@ -17,7 +17,6 @@ type file struct {
 	position int64
 	flag     int
 	mode     os.FileMode
-	modTime  time.Time
 
 	isClosed bool
 }
@@ -81,7 +80,6 @@ func (f *file) WriteAt(p []byte, off int64) (int, error) {
 		return 0, errors.New("write not supported")
 	}
 
-	f.modTime = time.Now()
 	n, err := f.content.WriteAt(p, off)
 	f.position = off + int64(n)
 
@@ -113,7 +111,6 @@ func (f *file) Duplicate(filename string, mode fs.FileMode, flag int) billy.File
 		content: f.content,
 		mode:    mode,
 		flag:    flag,
-		modTime: f.modTime,
 	}
 
 	if isTruncate(flag) {
@@ -132,7 +129,7 @@ func (f *file) Stat() (os.FileInfo, error) {
 		name:    f.Name(),
 		mode:    f.mode,
 		size:    f.content.Len(),
-		modTime: f.modTime,
+		modTime: f.content.modTime,
 	}, nil
 }
 
@@ -178,8 +175,9 @@ func (*fileInfo) Sys() interface{} {
 }
 
 type content struct {
-	name  string
-	bytes []byte
+	name    string
+	bytes   []byte
+	modTime time.Time
 
 	m sync.RWMutex
 }
@@ -205,6 +203,7 @@ func (c *content) WriteAt(p []byte, off int64) (int, error) {
 	if len(c.bytes) < prev {
 		c.bytes = c.bytes[:prev]
 	}
+	c.modTime = time.Now()
 	c.m.Unlock()
 
 	return len(p), nil
diff --git a/memfs/memory_test.go b/memfs/memory_test.go
@@ -65,6 +65,13 @@ func TestModTime(t *testing.T) {
 
 	// new calls to ModTime() retain existing mod time.
 	assert.Equal(t, modtime, fi1a.ModTime())
+
+	// Writing to file should change the mod time
+	err = util.WriteFile(fs, "/file1", []byte{0}, 0o666)
+	require.NoError(t, err)
+	fi1c, err := fs.Stat("/file1")
+	require.NoError(t, err)
+	assert.NotEqual(t, modtime, fi1c.ModTime())
 }
 
 func TestNegativeOffsets(t *testing.T) {
diff --git a/memfs/storage.go b/memfs/storage.go
@@ -44,11 +44,13 @@ func (s *storage) New(path string, mode fs.FileMode, flag int) (*file, error) {
 
 	name := filepath.Base(path)
 	f := &file{
-		name:    name,
-		content: &content{name: name},
-		mode:    mode,
-		flag:    flag,
-		modTime: time.Now(),
+		name: name,
+		content: &content{
+			name:    name,
+			modTime: time.Now(),
+		},
+		mode: mode,
+		flag: flag,
 	}
 
 	s.mf.Lock()
diff --git a/osfs/os_posix.go b/osfs/os_posix.go
@@ -14,14 +14,14 @@ func (f *file) Lock() error {
 	f.m.Lock()
 	defer f.m.Unlock()
 
-	return unix.Flock(int(f.File.Fd()), unix.LOCK_EX)
+	return unix.Flock(int(f.Fd()), unix.LOCK_EX)
 }
 
 func (f *file) Unlock() error {
 	f.m.Lock()
 	defer f.m.Unlock()
 
-	return unix.Flock(int(f.File.Fd()), unix.LOCK_UN)
+	return unix.Flock(int(f.Fd()), unix.LOCK_UN)
 }
 
 func (f *file) Sync() error {
diff --git a/scripts/wasirun-wrapper b/scripts/wasirun-wrapper
@@ -3,7 +3,7 @@
 # Wrapper script for wasirun to be executable by go test -exec
 #
 
-which wasirun || go install github.com/stealthrocket/wasi-go/cmd/wasirun@latest
+which wasirun || go install github.com/stealthrocket/wasi-go/cmd/wasirun@v0.8.0
 
 # Make temp dir for for mapping into wasirun
 map_dir=$(mktemp -d)
diff --git a/test/basic_test.go b/test/basic_test.go
@@ -12,7 +12,6 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/go-git/go-billy/v6"
 	. "github.com/go-git/go-billy/v6" //nolint
 	"github.com/go-git/go-billy/v6/osfs"
 	"github.com/go-git/go-billy/v6/util"
@@ -71,7 +70,7 @@ func TestCreateOverwrite(t *testing.T) {
 			f, err := fs.Create("foo")
 			require.NoError(t, err)
 
-			l, err := f.Write([]byte(fmt.Sprintf("foo%d", i)))
+			l, err := fmt.Fprintf(f, "foo%d", i)
 			require.NoError(t, err)
 			assert.Equal(t, 4, l)
 
@@ -477,7 +476,7 @@ func TestStatNonExistent(t *testing.T) {
 func TestRename(t *testing.T) {
 	tests := []struct {
 		name      string
-		before    func(*testing.T, billy.Filesystem)
+		before    func(*testing.T, Filesystem)
 		from      string
 		to        string
 		wantErr   *error
@@ -491,7 +490,7 @@ func TestRename(t *testing.T) {
 		},
 		{
 			name: "file rename",
-			before: func(t *testing.T, fs billy.Filesystem) {
+			before: func(t *testing.T, fs Filesystem) {
 				root := fsRoot(fs)
 				f, err := fs.Create(fs.Join(root, "foo"))
 				require.NoError(t, err)
@@ -503,7 +502,7 @@ func TestRename(t *testing.T) {
 		},
 		{
 			name: "dir rename",
-			before: func(t *testing.T, fs billy.Filesystem) {
+			before: func(t *testing.T, fs Filesystem) {
 				root := fsRoot(fs)
 				f, err := fs.Create(fs.Join(root, "foo", "bar1"))
 				require.NoError(t, err)
@@ -568,7 +567,7 @@ func TestRename(t *testing.T) {
 	})
 }
 
-func fsRoot(fs billy.Filesystem) string {
+func fsRoot(fs Filesystem) string {
 	if reflect.TypeOf(fs) == reflect.TypeOf(&osfs.BoundOS{}) {
 		return fs.Root()
 	}
