Skip to content

Commit d038061

Browse files
committed
chore: sync with go1.20.14
1 parent 5b70ac8 commit d038061

File tree

5 files changed

+9
-2
lines changed

5 files changed

+9
-2
lines changed

internal/cache/cache_test.go

+5
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"fmt"
1111
"os"
1212
"path/filepath"
13+
"runtime"
1314
"testing"
1415
"time"
1516
)
@@ -150,6 +151,10 @@ func dummyID(x int) [HashSize]byte {
150151
}
151152

152153
func TestCacheTrim(t *testing.T) {
154+
if runtime.GOOS == "js" {
155+
t.Skip(t, "js")
156+
}
157+
153158
dir, err := os.MkdirTemp("", "cachetest-")
154159
if err != nil {
155160
t.Fatal(err)

internal/cache/readme.md

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
Extracted from `go/src/cmd/go/internal/cache/`.
44

5+
- sync with go1.20.14
56
- sync with go1.19.13
67
- sync with go1.18.10
78
- sync with go1.17.13

internal/mmap/mmap_other.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style
33
// license that can be found in the LICENSE file.
44

5-
//go:build plan9 || solaris
5+
//go:build (js && wasm) || plan9
66

77
package mmap
88

internal/mmap/mmap_unix.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style
33
// license that can be found in the LICENSE file.
44

5-
//go:build unix && !solaris
5+
//go:build unix
66

77
package mmap
88

internal/mmap/readme.md

+1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22

33
Extracted from `go/src/cmd/go/internal/mmap/` (related to `cache`).
44

5+
- sync with go1.20.14
56
- sync with go1.19.13

0 commit comments

Comments
 (0)