diff options
-rw-r--r-- | scripts/fork_go_templates/main.go | 2 | ||||
-rw-r--r-- | tpl/internal/go_templates/testenv/testenv.go | 1 | ||||
-rw-r--r-- | tpl/internal/go_templates/testenv/testenv_test.go | 2 | ||||
-rw-r--r-- | tpl/internal/go_templates/texttemplate/exec_test.go | 3 | ||||
-rw-r--r-- | tpl/internal/go_templates/texttemplate/parse/parse_test.go | 3 |
5 files changed, 3 insertions, 8 deletions
diff --git a/scripts/fork_go_templates/main.go b/scripts/fork_go_templates/main.go index 38e81ac9d..476fe480b 100644 --- a/scripts/fork_go_templates/main.go +++ b/scripts/fork_go_templates/main.go @@ -16,7 +16,7 @@ import ( ) func main() { - // The current is built with db6097f8cb [release-branch.go1.22] go1.22.1 + // The current is built with 8e1fdea8316d840fd07e9d6e026048e53290948b go1.22.5 // TODO(bep) preserve the staticcheck.conf file. fmt.Println("Forking ...") defer fmt.Println("Done ...") diff --git a/tpl/internal/go_templates/testenv/testenv.go b/tpl/internal/go_templates/testenv/testenv.go index 97d897a1f..277df2255 100644 --- a/tpl/internal/go_templates/testenv/testenv.go +++ b/tpl/internal/go_templates/testenv/testenv.go @@ -320,6 +320,7 @@ func MustInternalLink(t testing.TB, withCgo bool) { // If not, MustHaveBuildMode calls t.Skip with an explanation. // Modified by Hugo (not needed) func MustHaveBuildMode(t testing.TB, buildmode string) { + return } // HasSymlink reports whether the current system can use os.Symlink. diff --git a/tpl/internal/go_templates/testenv/testenv_test.go b/tpl/internal/go_templates/testenv/testenv_test.go index d4b2b368f..4aabc00a6 100644 --- a/tpl/internal/go_templates/testenv/testenv_test.go +++ b/tpl/internal/go_templates/testenv/testenv_test.go @@ -54,7 +54,7 @@ func TestGoToolLocation(t *testing.T) { } } -// Modified by Hugo. +// Modified by Hugo (not needed) func TestHasGoBuild(t *testing.T) { } diff --git a/tpl/internal/go_templates/texttemplate/exec_test.go b/tpl/internal/go_templates/texttemplate/exec_test.go index 030e20ca0..ed75adacb 100644 --- a/tpl/internal/go_templates/texttemplate/exec_test.go +++ b/tpl/internal/go_templates/texttemplate/exec_test.go @@ -2,9 +2,6 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build go1.13 && !windows -// +build go1.13,!windows - package template import ( diff --git a/tpl/internal/go_templates/texttemplate/parse/parse_test.go b/tpl/internal/go_templates/texttemplate/parse/parse_test.go index 080eea2f9..59e0a1741 100644 --- a/tpl/internal/go_templates/texttemplate/parse/parse_test.go +++ b/tpl/internal/go_templates/texttemplate/parse/parse_test.go @@ -2,9 +2,6 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build go1.13 -// +build go1.13 - package parse import ( |