From 68e199e4ebf9953c48be8533722d08186a942964 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Sat, 19 Oct 2024 08:14:29 +0900 Subject: [PATCH 1/2] go.mod: update dependencies Signed-off-by: Akihiro Suda --- example/gui-linux/go.mod | 10 +++++----- example/gui-linux/go.sum | 9 +++++++++ example/linux/go.mod | 6 +++--- example/linux/go.sum | 4 ++++ example/macOS/go.mod | 4 ++-- example/macOS/go.sum | 2 ++ go.mod | 8 ++++---- go.sum | 6 ++++++ 8 files changed, 35 insertions(+), 14 deletions(-) diff --git a/example/gui-linux/go.mod b/example/gui-linux/go.mod index b5b6e133..6a18ddc9 100644 --- a/example/gui-linux/go.mod +++ b/example/gui-linux/go.mod @@ -1,6 +1,6 @@ module github.com/lima-vm/vz/example/gui-linux -go 1.19 +go 1.22.0 replace github.com/lima-vm/vz/v4 => ../../ @@ -11,8 +11,8 @@ require ( 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.6.0 // indirect - golang.org/x/sys v0.16.0 // indirect - golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect + golang.org/x/mod v0.21.0 // indirect + golang.org/x/sys v0.26.0 // indirect + golang.org/x/term v0.25.0 // indirect ) diff --git a/example/gui-linux/go.sum b/example/gui-linux/go.sum index 7b19a30f..f0928cbb 100644 --- a/example/gui-linux/go.sum +++ b/example/gui-linux/go.sum @@ -4,11 +4,20 @@ 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= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc= golang.org/x/mod v0.6.0 h1:b9gGHsz9/HhJ3HF5DHQytPpuwocVTChQJK3AvoLRD5I= golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI= +golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= +golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= +golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= 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= +golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24= +golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M= diff --git a/example/linux/go.mod b/example/linux/go.mod index 6bc082c4..d69ad6f3 100644 --- a/example/linux/go.mod +++ b/example/linux/go.mod @@ -1,16 +1,16 @@ module github.com/lima-vm/vz/example/linux -go 1.19 +go 1.22.0 replace github.com/lima-vm/vz/v4 => ../../ require ( github.com/lima-vm/vz/v4 v4.0.0-00010101000000-000000000000 github.com/pkg/term v1.1.0 - golang.org/x/sys v0.16.0 + golang.org/x/sys v0.26.0 ) require ( github.com/Code-Hex/go-infinity-channel v1.0.0 // indirect - golang.org/x/mod v0.6.0 // indirect + golang.org/x/mod v0.21.0 // indirect ) diff --git a/example/linux/go.sum b/example/linux/go.sum index c9c63371..ea5aa4bc 100644 --- a/example/linux/go.sum +++ b/example/linux/go.sum @@ -5,6 +5,10 @@ github.com/pkg/term v1.1.0/go.mod h1:E25nymQcrSllhX42Ok8MRm1+hyBdHY0dCeiKZ9jpNGw golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc= golang.org/x/mod v0.6.0 h1:b9gGHsz9/HhJ3HF5DHQytPpuwocVTChQJK3AvoLRD5I= golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI= +golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= +golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= +golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= diff --git a/example/macOS/go.mod b/example/macOS/go.mod index 019459e8..1b6d4f39 100644 --- a/example/macOS/go.mod +++ b/example/macOS/go.mod @@ -1,6 +1,6 @@ module github.com/lima-vm/vz/example/macOS -go 1.19 +go 1.22.0 replace github.com/lima-vm/vz/v4 => ../../ @@ -8,5 +8,5 @@ require github.com/lima-vm/vz/v4 v4.0.0-00010101000000-000000000000 require ( github.com/Code-Hex/go-infinity-channel v1.0.0 // indirect - golang.org/x/mod v0.6.0 // indirect + golang.org/x/mod v0.21.0 // indirect ) diff --git a/example/macOS/go.sum b/example/macOS/go.sum index 4c3deb19..ca08bb41 100644 --- a/example/macOS/go.sum +++ b/example/macOS/go.sum @@ -3,4 +3,6 @@ github.com/Code-Hex/go-infinity-channel v1.0.0/go.mod h1:5yUVg/Fqao9dAjcpzoQ33Ww golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc= golang.org/x/mod v0.6.0 h1:b9gGHsz9/HhJ3HF5DHQytPpuwocVTChQJK3AvoLRD5I= golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI= +golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= +golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= diff --git a/go.mod b/go.mod index aa5074b3..585227e6 100644 --- a/go.mod +++ b/go.mod @@ -1,11 +1,11 @@ module github.com/lima-vm/vz/v4 -go 1.19 +go 1.22.0 require ( github.com/Code-Hex/go-infinity-channel v1.0.0 - golang.org/x/crypto v0.18.0 - golang.org/x/mod v0.6.0 + golang.org/x/crypto v0.28.0 + golang.org/x/mod v0.21.0 ) -require golang.org/x/sys v0.16.0 // indirect +require golang.org/x/sys v0.26.0 // indirect diff --git a/go.sum b/go.sum index cc5cb9d0..596a6db9 100644 --- a/go.sum +++ b/go.sum @@ -2,8 +2,14 @@ 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= golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc= golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= +golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw= +golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U= golang.org/x/mod v0.6.0 h1:b9gGHsz9/HhJ3HF5DHQytPpuwocVTChQJK3AvoLRD5I= golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI= +golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= +golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= +golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE= From d42c958292084be959dd3b69f73ff6b1e8ec8d1e Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Sat, 19 Oct 2024 08:24:13 +0900 Subject: [PATCH 2/2] CI: add ARM runner (build only) The ARM runner still cannot be used for running tests, as nested virt is still unsupported. Signed-off-by: Akihiro Suda --- .github/workflows/compile.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml index 8aafc4d8..ca39b4de 100644 --- a/.github/workflows/compile.yml +++ b/.github/workflows/compile.yml @@ -29,8 +29,8 @@ jobs: matrix: os: - macos-13 # Intel - - macos-14-large # Intel - - macos-15-large # Intel + - macos-14 # ARM + - macos-15 # ARM go: - '^1.22' - '^1.23' @@ -47,6 +47,9 @@ jobs: run: make -C example/linux - name: Build GUI Linux run: make -C example/gui-linux + - name: Build macOS + run: make -C example/macOS + if: runner.arch == 'ARM64' test: needs: build runs-on: ${{ matrix.os }}