From 4a3a1894b83e556b60ad9f858520ad2f842b4a4f Mon Sep 17 00:00:00 2001 From: Christophe Fergeau Date: Tue, 23 Sep 2025 09:11:47 +0200 Subject: [PATCH 1/5] gha: Update actions/setup-go to v6 This ensures GOTOOLCHAIN is set to `local`, which avoids silent downloads of newer go versions when the version in `go.mod` is newer than is specified in the workflow definition. Signed-off-by: Christophe Fergeau --- .github/workflows/compile.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml index 6e097a3..2a02946 100644 --- a/.github/workflows/compile.yml +++ b/.github/workflows/compile.yml @@ -38,7 +38,7 @@ jobs: - name: Check out repository code uses: actions/checkout@v4 - name: Set up Go - uses: actions/setup-go@v5 + uses: actions/setup-go@v6 with: go-version: ${{ matrix.go }} - name: vet @@ -66,7 +66,7 @@ jobs: - name: Check out repository code uses: actions/checkout@v4 - name: Set up Go - uses: actions/setup-go@v5 + uses: actions/setup-go@v6 with: go-version: ${{ matrix.go }} - name: Download Linux kernel From 7a89b8ed45511201f787e7199bf2e295231ad642 Mon Sep 17 00:00:00 2001 From: Christophe Fergeau Date: Tue, 23 Sep 2025 09:13:35 +0200 Subject: [PATCH 2/5] gha: Update go versions to 1.24 and 1.25 These are the 2 versions which are currently supported upstream. Signed-off-by: Christophe Fergeau --- .github/workflows/compile.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml index 2a02946..6d544af 100644 --- a/.github/workflows/compile.yml +++ b/.github/workflows/compile.yml @@ -32,8 +32,8 @@ jobs: - macos-14 - macos-15 go: - - '^1.22' - - '^1.23' + - '^1.24' + - '^1.25' steps: - name: Check out repository code uses: actions/checkout@v4 @@ -61,7 +61,7 @@ jobs: os: - macos-13 # because macOS 14, 15 does not support build on nested virtualization go: - - '^1.23' + - '^1.24' steps: - name: Check out repository code uses: actions/checkout@v4 From 3cdee906be2ae3616fc520a7ed13113b00ff49ef Mon Sep 17 00:00:00 2001 From: Christophe Fergeau Date: Tue, 23 Sep 2025 09:22:01 +0200 Subject: [PATCH 3/5] Bump golang.org/x/crypto from 0.31.0 to 0.42.0 Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.31.0 to 0.42.0. - [Commits](https://github.com/golang/crypto/compare/v0.31.0...v0.42.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-version: 0.42.0 dependency-type: direct:production ... Signed-off-by: dependabot[bot] Signed-off-by: Christophe Fergeau --- example/gui-linux/go.mod | 6 ++---- example/gui-linux/go.sum | 8 ++++---- example/linux/go.mod | 6 ++---- example/linux/go.sum | 8 ++++---- example/macOS/go.mod | 4 +--- example/macOS/go.sum | 8 ++++---- go.mod | 8 +++----- go.sum | 12 ++++++------ 8 files changed, 26 insertions(+), 34 deletions(-) diff --git a/example/gui-linux/go.mod b/example/gui-linux/go.mod index 2dc10dc..73cafd0 100644 --- a/example/gui-linux/go.mod +++ b/example/gui-linux/go.mod @@ -1,8 +1,6 @@ module github.com/Code-Hex/vz/example/gui-linux -go 1.22.0 - -toolchain go1.23.4 +go 1.24.0 replace github.com/Code-Hex/vz/v3 => ../../ @@ -15,6 +13,6 @@ require ( github.com/Code-Hex/go-infinity-channel v1.0.0 // indirect github.com/mattn/go-isatty v0.0.14 // indirect golang.org/x/mod v0.22.0 // indirect - golang.org/x/sys v0.28.0 // indirect + golang.org/x/sys v0.36.0 // indirect golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 // indirect ) diff --git a/example/gui-linux/go.sum b/example/gui-linux/go.sum index daa853c..c28d6c4 100644 --- a/example/gui-linux/go.sum +++ b/example/gui-linux/go.sum @@ -4,12 +4,12 @@ github.com/Songmu/prompter v0.5.1 h1:IAsttKsOZWSDw7bV1mtGn9TAmLFAjXbp9I/eYmUUogo github.com/Songmu/prompter v0.5.1/go.mod h1:CS3jEPD6h9IaLaG6afrl1orTgII9+uDWuw95dr6xHSw= github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= -golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= -golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= +golang.org/x/crypto v0.42.0 h1:chiH31gIWm57EkTXpwnqf8qeuMUi0yekh6mT2AvFlqI= +golang.org/x/crypto v0.42.0/go.mod h1:4+rDnOTJhQCx2q7/j6rAN5XDw8kPjeaXEUR2eL94ix8= golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4= golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= -golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k= +golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 h1:CBpWXWQpIRjzmkkA+M7q9Fqnwd2mZr3AFqexg8YTfoM= golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= diff --git a/example/linux/go.mod b/example/linux/go.mod index e20ff13..38c003e 100644 --- a/example/linux/go.mod +++ b/example/linux/go.mod @@ -1,15 +1,13 @@ module github.com/Code-Hex/vz/example/linux -go 1.22.0 - -toolchain go1.23.4 +go 1.24.0 replace github.com/Code-Hex/vz/v3 => ../../ require ( github.com/Code-Hex/vz/v3 v3.0.0-00010101000000-000000000000 github.com/pkg/term v1.1.0 - golang.org/x/sys v0.28.0 + golang.org/x/sys v0.36.0 ) require ( diff --git a/example/linux/go.sum b/example/linux/go.sum index 0774aca..3ae0d48 100644 --- a/example/linux/go.sum +++ b/example/linux/go.sum @@ -2,10 +2,10 @@ github.com/Code-Hex/go-infinity-channel v1.0.0 h1:M8BWlfDOxq9or9yvF9+YkceoTkDI1p github.com/Code-Hex/go-infinity-channel v1.0.0/go.mod h1:5yUVg/Fqao9dAjcpzoQ33WwfdMWmISOrQloDRn3bsvY= github.com/pkg/term v1.1.0 h1:xIAAdCMh3QIAy+5FrE8Ad8XoDhEU4ufwbaSozViP9kk= github.com/pkg/term v1.1.0/go.mod h1:E25nymQcrSllhX42Ok8MRm1+hyBdHY0dCeiKZ9jpNGw= -golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= -golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= +golang.org/x/crypto v0.42.0 h1:chiH31gIWm57EkTXpwnqf8qeuMUi0yekh6mT2AvFlqI= +golang.org/x/crypto v0.42.0/go.mod h1:4+rDnOTJhQCx2q7/j6rAN5XDw8kPjeaXEUR2eL94ix8= golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4= golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= -golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k= +golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= diff --git a/example/macOS/go.mod b/example/macOS/go.mod index 8cedfa8..cf28973 100644 --- a/example/macOS/go.mod +++ b/example/macOS/go.mod @@ -1,8 +1,6 @@ module github.com/Code-Hex/vz/example/macOS -go 1.22.0 - -toolchain go1.23.4 +go 1.24.0 replace github.com/Code-Hex/vz/v3 => ../../ diff --git a/example/macOS/go.sum b/example/macOS/go.sum index e32f921..b241bd5 100644 --- a/example/macOS/go.sum +++ b/example/macOS/go.sum @@ -1,8 +1,8 @@ github.com/Code-Hex/go-infinity-channel v1.0.0 h1:M8BWlfDOxq9or9yvF9+YkceoTkDI1pFAqvnP87Zh0Nw= github.com/Code-Hex/go-infinity-channel v1.0.0/go.mod h1:5yUVg/Fqao9dAjcpzoQ33WwfdMWmISOrQloDRn3bsvY= -golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= -golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= +golang.org/x/crypto v0.42.0 h1:chiH31gIWm57EkTXpwnqf8qeuMUi0yekh6mT2AvFlqI= +golang.org/x/crypto v0.42.0/go.mod h1:4+rDnOTJhQCx2q7/j6rAN5XDw8kPjeaXEUR2eL94ix8= golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4= golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= -golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= -golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k= +golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= diff --git a/go.mod b/go.mod index 0775114..c8156c6 100644 --- a/go.mod +++ b/go.mod @@ -1,13 +1,11 @@ module github.com/Code-Hex/vz/v3 -go 1.22.0 - -toolchain go1.23.4 +go 1.24.0 require ( github.com/Code-Hex/go-infinity-channel v1.0.0 - golang.org/x/crypto v0.31.0 + golang.org/x/crypto v0.42.0 golang.org/x/mod v0.22.0 ) -require golang.org/x/sys v0.28.0 // indirect +require golang.org/x/sys v0.36.0 // indirect diff --git a/go.sum b/go.sum index f29b719..a5f1d4b 100644 --- a/go.sum +++ b/go.sum @@ -1,10 +1,10 @@ github.com/Code-Hex/go-infinity-channel v1.0.0 h1:M8BWlfDOxq9or9yvF9+YkceoTkDI1pFAqvnP87Zh0Nw= github.com/Code-Hex/go-infinity-channel v1.0.0/go.mod h1:5yUVg/Fqao9dAjcpzoQ33WwfdMWmISOrQloDRn3bsvY= -golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= -golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= +golang.org/x/crypto v0.42.0 h1:chiH31gIWm57EkTXpwnqf8qeuMUi0yekh6mT2AvFlqI= +golang.org/x/crypto v0.42.0/go.mod h1:4+rDnOTJhQCx2q7/j6rAN5XDw8kPjeaXEUR2eL94ix8= golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4= golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= -golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= -golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q= -golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= +golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k= +golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/term v0.35.0 h1:bZBVKBudEyhRcajGcNc3jIfWPqV4y/Kt2XcoigOWtDQ= +golang.org/x/term v0.35.0/go.mod h1:TPGtkTLesOwf2DE8CgVYiZinHAOuy5AYUYT1lENIZnA= From 8bf7ba5bed8b073ea40520e31be132ac29deee29 Mon Sep 17 00:00:00 2001 From: Christophe Fergeau Date: Mon, 11 Aug 2025 16:47:29 +0200 Subject: [PATCH 4/5] build: Add dependabot config file By telling it there are go.mod files in example/*, hopefully this will limit the need for commits where we run `go mod tidy` ourselves. Signed-off-by: Christophe Fergeau --- .github/dependabot.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..b891ea9 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,12 @@ +version: 2 +updates: +- package-ecosystem: gomod + directory: "/" +- package-ecosystem: gomod + directory: "/example/gui-linux" +- package-ecosystem: gomod + directory: "/example/linux" +- package-ecosystem: gomod + directory: "/example/macos" +- package-ecosystem: github-actions + directory: "/" From 2bc6eaefc0bf379026dc63eaf7af7cecda5faff6 Mon Sep 17 00:00:00 2001 From: Christophe Fergeau Date: Tue, 23 Sep 2025 09:32:14 +0200 Subject: [PATCH 5/5] addtags: Fix `go vet` errors With newer go versions, `go vet` reports: ``` cmd/addtags/main.go:19:25: non-constant format string in call to fmt.Fprintf cmd/addtags/main.go:24:25: non-constant format string in call to fmt.Fprintf ``` This happens because of the use of [1:] to remove an unwanted `\n` at the beginning of the string. This commit switches to `Fprint` instead of `Fprintf` as there are no substitutions to be made in the string. Signed-off-by: Christophe Fergeau --- cmd/addtags/main.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/addtags/main.go b/cmd/addtags/main.go index e15b2fc..f79ffe9 100644 --- a/cmd/addtags/main.go +++ b/cmd/addtags/main.go @@ -16,12 +16,12 @@ var ( ) func usage() { - fmt.Fprintf(os.Stderr, ` + fmt.Fprint(os.Stderr, ` usage: addtags -tags -file FILE `[1:]) flag.PrintDefaults() - fmt.Fprintf(os.Stderr, ` + fmt.Fprint(os.Stderr, ` It is intended for use with 'go generate', so it also runs a subcommand, which presumably creates the file. Sample usage: