From e3eeb9cd091364dcef50007b4182c6b60f126e44 Mon Sep 17 00:00:00 2001 From: ashraffouda Date: Tue, 14 Jul 2026 13:49:48 +0200 Subject: [PATCH 1/2] Rename module path zos4 -> zos_v4 to match repo The repo was renamed zos4 -> zos_v4, but the module still declared github.com/threefoldtech/zos4, which relies on the (non-permanent) rename redirect and collides with zoslight/zos_light. Rename the main + nested (tools/zos-update-version) module directives, internal imports, and Makefile ldflags to github.com/threefoldtech/zos_v4. Both modules build. The zosbase dependency is left at v1.0.3 (separate, deferred migration). Co-Authored-By: Claude Opus 4.8 (1M context) --- CONTRIBUTING.md | 6 +++--- VALUES.md | 2 +- cmds/Makefile | 2 +- cmds/identityd/main.go | 8 ++++---- cmds/modules/api_gateway/main.go | 4 ++-- cmds/modules/netlightd/main.go | 2 +- cmds/modules/noded/main.go | 4 ++-- cmds/modules/powerd/main.go | 4 ++-- cmds/modules/provisiond/cap.go | 2 +- cmds/modules/provisiond/events.go | 2 +- cmds/modules/provisiond/main.go | 4 ++-- cmds/modules/provisiond/reporter.go | 2 +- cmds/modules/zui/header.go | 4 ++-- cmds/modules/zui/service.go | 2 +- cmds/zos/main.go | 24 +++++++++++----------- go.mod | 2 +- pkg/Makefile | 2 +- pkg/identity.go | 2 +- pkg/identity/identityd.go | 2 +- pkg/power/power.go | 2 +- pkg/power/uptime.go | 2 +- pkg/provision/auth.go | 2 +- pkg/provision/engine.go | 2 +- pkg/registrar.go | 2 +- pkg/registrar_gateway.go | 2 +- pkg/registrar_gateway/registrar_gateway.go | 4 ++-- pkg/registrar_light/register.go | 2 +- pkg/registrar_light/registrar.go | 2 +- pkg/stubs/identity_stub.go | 2 +- pkg/upgrade/upgrade.go | 2 +- specs/upgrade.md | 2 +- tools/zos-update-worker/cmd/worker.go | 2 +- tools/zos-update-worker/go.mod | 2 +- tools/zos-update-worker/main.go | 2 +- 34 files changed, 56 insertions(+), 56 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a75f5d82..67f3976d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -40,8 +40,8 @@ exact code change can help focus discussions, so the choice is up to you. ## Setting up a development environment -Check out the [documentation](https://github.com/threefoldtech/zos4/tree/master/docs) learn about the code -base and setting up your [development environment](https://github.com/threefoldtech/zos4/blob/master/qemu/README.md). +Check out the [documentation](https://github.com/threefoldtech/zos_v4/tree/master/docs) learn about the code +base and setting up your [development environment](https://github.com/threefoldtech/zos_v4/blob/master/qemu/README.md). ## Pull requests @@ -74,7 +74,7 @@ pull requests. ## Issues -[GitHub issues](https://github.com/threefoldtech/zos4/issues/new) can be used to report bugs or submit feature requests. +[GitHub issues](https://github.com/threefoldtech/zos_v4/issues/new) can be used to report bugs or submit feature requests. When reporting a bug please include the following key pieces of information: diff --git a/VALUES.md b/VALUES.md index 9b013a08..58082c46 100644 --- a/VALUES.md +++ b/VALUES.md @@ -20,7 +20,7 @@ values we hold as a team: personally. Consider other people’s perspectives. Empathize with our users. Focus on the specific issue at hand, and remember that we all care about the project, first and foremost. - - [GitHub issues](https://github.com/threefoldtech/zos4/issues/new), + - [GitHub issues](https://github.com/threefoldtech/zos_v4/issues/new), document comments, or meetings are often better and higher bandwidth ways to communicate complex and nuanced design issues, as opposed to protracted heated live chats. diff --git a/cmds/Makefile b/cmds/Makefile index 96123152..03a84863 100644 --- a/cmds/Makefile +++ b/cmds/Makefile @@ -2,7 +2,7 @@ OUT = $(shell realpath -m ../bin) branch = $(shell git symbolic-ref -q --short HEAD || git describe --tags --exact-match) revision = $(shell git rev-parse HEAD) dirty = $(shell test -n "`git diff --shortstat 2> /dev/null | tail -n1`" && echo "*") -version = github.com/threefoldtech/zos4/pkg/version +version = github.com/threefoldtech/zos_v4/pkg/version ldflags = '-w -s -X $(version).Branch=$(branch) -X $(version).Revision=$(revision) -X $(version).Dirty=$(dirty) -extldflags "-static"' all: identityd internet zos diff --git a/cmds/identityd/main.go b/cmds/identityd/main.go index 8337362b..ffc2c63f 100644 --- a/cmds/identityd/main.go +++ b/cmds/identityd/main.go @@ -10,12 +10,12 @@ import ( "time" "github.com/pkg/errors" - "github.com/threefoldtech/zos4/pkg/stubs" - "github.com/threefoldtech/zos4/pkg/upgrade" + "github.com/threefoldtech/zos_v4/pkg/stubs" + "github.com/threefoldtech/zos_v4/pkg/upgrade" "github.com/threefoldtech/zosbase/pkg/app" - "github.com/threefoldtech/zos4/pkg" - "github.com/threefoldtech/zos4/pkg/identity" + "github.com/threefoldtech/zos_v4/pkg" + "github.com/threefoldtech/zos_v4/pkg/identity" "github.com/threefoldtech/zosbase/pkg/environment" "github.com/rs/zerolog/log" diff --git a/cmds/modules/api_gateway/main.go b/cmds/modules/api_gateway/main.go index 7cd4836c..6dfe6e1e 100644 --- a/cmds/modules/api_gateway/main.go +++ b/cmds/modules/api_gateway/main.go @@ -10,8 +10,8 @@ import ( "github.com/rs/zerolog/log" "github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go/peer" "github.com/threefoldtech/zbus" - registrar "github.com/threefoldtech/zos4/pkg/registrar_gateway" - "github.com/threefoldtech/zos4/pkg/stubs" + registrar "github.com/threefoldtech/zos_v4/pkg/registrar_gateway" + "github.com/threefoldtech/zos_v4/pkg/stubs" "github.com/threefoldtech/zosbase/pkg/environment" "github.com/threefoldtech/zosbase/pkg/utils" zosapi "github.com/threefoldtech/zosbase/pkg/zos_api_light" diff --git a/cmds/modules/netlightd/main.go b/cmds/modules/netlightd/main.go index 9f03f52f..03c13494 100644 --- a/cmds/modules/netlightd/main.go +++ b/cmds/modules/netlightd/main.go @@ -20,7 +20,7 @@ import ( "github.com/cenkalti/backoff/v3" "github.com/rs/zerolog/log" "github.com/threefoldtech/zbus" - "github.com/threefoldtech/zos4/pkg/stubs" + "github.com/threefoldtech/zos_v4/pkg/stubs" "github.com/threefoldtech/zosbase/pkg/netlight/bootstrap" "github.com/threefoldtech/zosbase/pkg/utils" ) diff --git a/cmds/modules/noded/main.go b/cmds/modules/noded/main.go index fe237c47..9853271b 100644 --- a/cmds/modules/noded/main.go +++ b/cmds/modules/noded/main.go @@ -9,8 +9,8 @@ import ( "github.com/pkg/errors" "github.com/urfave/cli/v2" - registrar "github.com/threefoldtech/zos4/pkg/registrar_light" - zos4stubs "github.com/threefoldtech/zos4/pkg/stubs" + registrar "github.com/threefoldtech/zos_v4/pkg/registrar_light" + zos4stubs "github.com/threefoldtech/zos_v4/pkg/stubs" "github.com/threefoldtech/zosbase/pkg/app" "github.com/threefoldtech/zosbase/pkg/capacity" "github.com/threefoldtech/zosbase/pkg/environment" diff --git a/cmds/modules/powerd/main.go b/cmds/modules/powerd/main.go index b863e59a..88f9afb1 100644 --- a/cmds/modules/powerd/main.go +++ b/cmds/modules/powerd/main.go @@ -8,8 +8,8 @@ import ( "github.com/rs/zerolog/log" substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go" "github.com/threefoldtech/zbus" - "github.com/threefoldtech/zos4/pkg/power" - zos4stub "github.com/threefoldtech/zos4/pkg/stubs" + "github.com/threefoldtech/zos_v4/pkg/power" + zos4stub "github.com/threefoldtech/zos_v4/pkg/stubs" "github.com/threefoldtech/zosbase/pkg/environment" "github.com/threefoldtech/zosbase/pkg/events" "github.com/threefoldtech/zosbase/pkg/stubs" diff --git a/cmds/modules/provisiond/cap.go b/cmds/modules/provisiond/cap.go index 18965118..b81bfe6f 100644 --- a/cmds/modules/provisiond/cap.go +++ b/cmds/modules/provisiond/cap.go @@ -8,7 +8,7 @@ import ( "github.com/centrifuge/go-substrate-rpc-client/v4/types" "github.com/rs/zerolog/log" substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go" - "github.com/threefoldtech/zos4/pkg/stubs" + "github.com/threefoldtech/zos_v4/pkg/stubs" gridtypes "github.com/threefoldtech/zosbase/pkg/gridtypes" "github.com/threefoldtech/zosbase/pkg/provision" ) diff --git a/cmds/modules/provisiond/events.go b/cmds/modules/provisiond/events.go index 27ab0b30..0f363aaf 100644 --- a/cmds/modules/provisiond/events.go +++ b/cmds/modules/provisiond/events.go @@ -6,7 +6,7 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "github.com/threefoldtech/zos4/pkg/stubs" + "github.com/threefoldtech/zos_v4/pkg/stubs" "github.com/threefoldtech/zosbase/pkg/events" "github.com/threefoldtech/zosbase/pkg/gridtypes" "github.com/threefoldtech/zosbase/pkg/provision" diff --git a/cmds/modules/provisiond/main.go b/cmds/modules/provisiond/main.go index a4c04524..8781166c 100644 --- a/cmds/modules/provisiond/main.go +++ b/cmds/modules/provisiond/main.go @@ -24,14 +24,14 @@ import ( "github.com/urfave/cli/v2" - zos4stubs "github.com/threefoldtech/zos4/pkg/stubs" + zos4stubs "github.com/threefoldtech/zos_v4/pkg/stubs" "github.com/threefoldtech/zosbase/pkg/stubs" "github.com/threefoldtech/zosbase/pkg/utils" "github.com/rs/zerolog/log" "github.com/threefoldtech/zbus" - "github.com/threefoldtech/zos4/pkg/provision" + "github.com/threefoldtech/zos_v4/pkg/provision" ) const ( diff --git a/cmds/modules/provisiond/reporter.go b/cmds/modules/provisiond/reporter.go index 567f320a..99a1c565 100644 --- a/cmds/modules/provisiond/reporter.go +++ b/cmds/modules/provisiond/reporter.go @@ -13,7 +13,7 @@ import ( "github.com/rs/zerolog/log" substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go" "github.com/threefoldtech/zbus" - zos4stubs "github.com/threefoldtech/zos4/pkg/stubs" + zos4stubs "github.com/threefoldtech/zos_v4/pkg/stubs" "github.com/threefoldtech/zosbase/pkg" gridtypes "github.com/threefoldtech/zosbase/pkg/gridtypes" "github.com/threefoldtech/zosbase/pkg/rrd" diff --git a/cmds/modules/zui/header.go b/cmds/modules/zui/header.go index c2ed5303..7d176161 100644 --- a/cmds/modules/zui/header.go +++ b/cmds/modules/zui/header.go @@ -12,8 +12,8 @@ import ( "github.com/rs/zerolog/log" "github.com/threefoldtech/zbus" - registrar "github.com/threefoldtech/zos4/pkg/registrar_light" - zos4Stubs "github.com/threefoldtech/zos4/pkg/stubs" + registrar "github.com/threefoldtech/zos_v4/pkg/registrar_light" + zos4Stubs "github.com/threefoldtech/zos_v4/pkg/stubs" "github.com/threefoldtech/zosbase/pkg/app" "github.com/threefoldtech/zosbase/pkg/environment" "github.com/threefoldtech/zosbase/pkg/stubs" diff --git a/cmds/modules/zui/service.go b/cmds/modules/zui/service.go index b317c500..fe0f6132 100644 --- a/cmds/modules/zui/service.go +++ b/cmds/modules/zui/service.go @@ -7,7 +7,7 @@ import ( "github.com/gizak/termui/v3/widgets" "github.com/threefoldtech/zbus" - zos4stubs "github.com/threefoldtech/zos4/pkg/stubs" + zos4stubs "github.com/threefoldtech/zos_v4/pkg/stubs" "github.com/threefoldtech/zosbase/pkg/stubs" ) diff --git a/cmds/zos/main.go b/cmds/zos/main.go index 721149f9..5e997d57 100644 --- a/cmds/zos/main.go +++ b/cmds/zos/main.go @@ -7,18 +7,18 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - apigateway "github.com/threefoldtech/zos4/cmds/modules/api_gateway" - "github.com/threefoldtech/zos4/cmds/modules/contd" - "github.com/threefoldtech/zos4/cmds/modules/flistd" - "github.com/threefoldtech/zos4/cmds/modules/gateway" - "github.com/threefoldtech/zos4/cmds/modules/netlightd" - "github.com/threefoldtech/zos4/cmds/modules/noded" - "github.com/threefoldtech/zos4/cmds/modules/powerd" - "github.com/threefoldtech/zos4/cmds/modules/provisiond" - "github.com/threefoldtech/zos4/cmds/modules/storaged" - "github.com/threefoldtech/zos4/cmds/modules/vmd" - "github.com/threefoldtech/zos4/cmds/modules/zbusdebug" - "github.com/threefoldtech/zos4/cmds/modules/zui" + apigateway "github.com/threefoldtech/zos_v4/cmds/modules/api_gateway" + "github.com/threefoldtech/zos_v4/cmds/modules/contd" + "github.com/threefoldtech/zos_v4/cmds/modules/flistd" + "github.com/threefoldtech/zos_v4/cmds/modules/gateway" + "github.com/threefoldtech/zos_v4/cmds/modules/netlightd" + "github.com/threefoldtech/zos_v4/cmds/modules/noded" + "github.com/threefoldtech/zos_v4/cmds/modules/powerd" + "github.com/threefoldtech/zos_v4/cmds/modules/provisiond" + "github.com/threefoldtech/zos_v4/cmds/modules/storaged" + "github.com/threefoldtech/zos_v4/cmds/modules/vmd" + "github.com/threefoldtech/zos_v4/cmds/modules/zbusdebug" + "github.com/threefoldtech/zos_v4/cmds/modules/zui" "github.com/threefoldtech/zosbase/pkg/app" "github.com/threefoldtech/zosbase/pkg/version" "github.com/urfave/cli/v2" diff --git a/go.mod b/go.mod index adc1099e..1b1c44ed 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/threefoldtech/zos4 +module github.com/threefoldtech/zos_v4 go 1.23.0 diff --git a/pkg/Makefile b/pkg/Makefile index 0c366cbe..2ccb6f42 100644 --- a/pkg/Makefile +++ b/pkg/Makefile @@ -23,7 +23,7 @@ testrace: lint build generate: @echo "Generating modules client stubs" - go generate github.com/threefoldtech/zos4/pkg + go generate github.com/threefoldtech/zos_v4/pkg build: @CGO_ENABLED=0 go build -v ./... diff --git a/pkg/identity.go b/pkg/identity.go index 85af774c..5b9284d5 100644 --- a/pkg/identity.go +++ b/pkg/identity.go @@ -3,7 +3,7 @@ package pkg import "github.com/threefoldtech/zosbase/pkg" //go:generate mkdir -p stubs -//go:generate zbusc -module identityd -version 0.0.1 -name manager -package stubs github.com/threefoldtech/zos4/pkg+IdentityManager stubs/identity_stub.go +//go:generate zbusc -module identityd -version 0.0.1 -name manager -package stubs github.com/threefoldtech/zos_v4/pkg+IdentityManager stubs/identity_stub.go // Identifier is the interface that defines // how an object can be used as an identity diff --git a/pkg/identity/identityd.go b/pkg/identity/identityd.go index b643bd09..6a876f93 100644 --- a/pkg/identity/identityd.go +++ b/pkg/identity/identityd.go @@ -10,7 +10,7 @@ import ( "github.com/threefoldtech/zosbase/pkg/identity/store" "github.com/pkg/errors" - zos4pkg "github.com/threefoldtech/zos4/pkg" + zos4pkg "github.com/threefoldtech/zos_v4/pkg" "github.com/threefoldtech/zosbase/pkg" "github.com/threefoldtech/zosbase/pkg/environment" "github.com/threefoldtech/zosbase/pkg/identity" diff --git a/pkg/power/power.go b/pkg/power/power.go index 32a67e13..003bef89 100644 --- a/pkg/power/power.go +++ b/pkg/power/power.go @@ -10,7 +10,7 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" "github.com/threefoldtech/tfgrid4-sdk-go/node-registrar/client" - "github.com/threefoldtech/zos4/pkg/stubs" + "github.com/threefoldtech/zos_v4/pkg/stubs" "github.com/threefoldtech/zosbase/pkg" "github.com/threefoldtech/zosbase/pkg/events" "github.com/threefoldtech/zosbase/pkg/network/bridge" diff --git a/pkg/power/uptime.go b/pkg/power/uptime.go index c103cb76..473a1c08 100644 --- a/pkg/power/uptime.go +++ b/pkg/power/uptime.go @@ -10,7 +10,7 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" "github.com/shirou/gopsutil/host" - "github.com/threefoldtech/zos4/pkg/stubs" + "github.com/threefoldtech/zos_v4/pkg/stubs" "github.com/threefoldtech/zosbase/pkg/app" "github.com/threefoldtech/zosbase/pkg/utils" ) diff --git a/pkg/provision/auth.go b/pkg/provision/auth.go index 858f86ab..4a993641 100644 --- a/pkg/provision/auth.go +++ b/pkg/provision/auth.go @@ -8,7 +8,7 @@ import ( lru "github.com/hashicorp/golang-lru" "github.com/pkg/errors" - "github.com/threefoldtech/zos4/pkg/stubs" + "github.com/threefoldtech/zos_v4/pkg/stubs" "github.com/threefoldtech/zosbase/pkg/provision" ) diff --git a/pkg/provision/engine.go b/pkg/provision/engine.go index ecbbbda8..f3164c35 100644 --- a/pkg/provision/engine.go +++ b/pkg/provision/engine.go @@ -18,7 +18,7 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go" - "github.com/threefoldtech/zos4/pkg/stubs" + "github.com/threefoldtech/zos_v4/pkg/stubs" "github.com/threefoldtech/zosbase/pkg" "github.com/threefoldtech/zosbase/pkg/environment" "github.com/threefoldtech/zosbase/pkg/gridtypes" diff --git a/pkg/registrar.go b/pkg/registrar.go index e84e3da8..d330f57d 100644 --- a/pkg/registrar.go +++ b/pkg/registrar.go @@ -2,7 +2,7 @@ package pkg //go:generate mkdir -p stubs -//go:generate zbusc -module registrar -version 0.0.1 -name registrar -package stubs github.com/threefoldtech/zos4/pkg+Registrar stubs/registrar_stub.go +//go:generate zbusc -module registrar -version 0.0.1 -name registrar -package stubs github.com/threefoldtech/zos_v4/pkg+Registrar stubs/registrar_stub.go type Registrar interface { NodeID() (uint32, error) diff --git a/pkg/registrar_gateway.go b/pkg/registrar_gateway.go index a22c9e1b..5dcb4ed1 100644 --- a/pkg/registrar_gateway.go +++ b/pkg/registrar_gateway.go @@ -9,7 +9,7 @@ import ( "github.com/threefoldtech/zosbase/pkg" ) -//go:generate zbusc -module api-gateway -version 0.0.1 -name api-gateway -package stubs github.com/threefoldtech/zos4/pkg+RegistrarGateway stubs/registrar-gateway.go +//go:generate zbusc -module api-gateway -version 0.0.1 -name api-gateway -package stubs github.com/threefoldtech/zos_v4/pkg+RegistrarGateway stubs/registrar-gateway.go type RegistrarGateway interface { CreateTwin(relay []string, rmbEncKey string) (client.Account, error) diff --git a/pkg/registrar_gateway/registrar_gateway.go b/pkg/registrar_gateway/registrar_gateway.go index 3d097990..e31844fc 100644 --- a/pkg/registrar_gateway/registrar_gateway.go +++ b/pkg/registrar_gateway/registrar_gateway.go @@ -14,8 +14,8 @@ import ( substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go" "github.com/threefoldtech/tfgrid4-sdk-go/node-registrar/client" "github.com/threefoldtech/zbus" - zos4Pkg "github.com/threefoldtech/zos4/pkg" - "github.com/threefoldtech/zos4/pkg/stubs" + zos4Pkg "github.com/threefoldtech/zos_v4/pkg" + "github.com/threefoldtech/zos_v4/pkg/stubs" "github.com/threefoldtech/zosbase/pkg" "github.com/threefoldtech/zosbase/pkg/environment" ) diff --git a/pkg/registrar_light/register.go b/pkg/registrar_light/register.go index 0f4e6580..d2f4148d 100644 --- a/pkg/registrar_light/register.go +++ b/pkg/registrar_light/register.go @@ -11,7 +11,7 @@ import ( "github.com/rs/zerolog/log" "github.com/threefoldtech/tfgrid4-sdk-go/node-registrar/client" "github.com/threefoldtech/zbus" - zos4Stubs "github.com/threefoldtech/zos4/pkg/stubs" + zos4Stubs "github.com/threefoldtech/zos_v4/pkg/stubs" "github.com/threefoldtech/zosbase/pkg/environment" "github.com/threefoldtech/zosbase/pkg/geoip" gridtypes "github.com/threefoldtech/zosbase/pkg/gridtypes" diff --git a/pkg/registrar_light/registrar.go b/pkg/registrar_light/registrar.go index 394050e3..f594421c 100644 --- a/pkg/registrar_light/registrar.go +++ b/pkg/registrar_light/registrar.go @@ -10,7 +10,7 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" "github.com/threefoldtech/zbus" - zos4stubs "github.com/threefoldtech/zos4/pkg/stubs" + zos4stubs "github.com/threefoldtech/zos_v4/pkg/stubs" "github.com/threefoldtech/zosbase/pkg/app" "github.com/threefoldtech/zosbase/pkg/environment" "github.com/threefoldtech/zosbase/pkg/stubs" diff --git a/pkg/stubs/identity_stub.go b/pkg/stubs/identity_stub.go index 64a8fe2a..9c5611b7 100644 --- a/pkg/stubs/identity_stub.go +++ b/pkg/stubs/identity_stub.go @@ -7,7 +7,7 @@ package stubs import ( "context" zbus "github.com/threefoldtech/zbus" - pkg1 "github.com/threefoldtech/zos4/pkg" + pkg1 "github.com/threefoldtech/zos_v4/pkg" pkg "github.com/threefoldtech/zosbase/pkg" ) diff --git a/pkg/upgrade/upgrade.go b/pkg/upgrade/upgrade.go index 08224d58..815678aa 100644 --- a/pkg/upgrade/upgrade.go +++ b/pkg/upgrade/upgrade.go @@ -21,7 +21,7 @@ import ( "github.com/threefoldtech/0-fs/storage" "github.com/threefoldtech/tfgrid4-sdk-go/node-registrar/client" "github.com/threefoldtech/zbus" - "github.com/threefoldtech/zos4/pkg/stubs" + "github.com/threefoldtech/zos_v4/pkg/stubs" "github.com/threefoldtech/zosbase/pkg/app" "github.com/threefoldtech/zosbase/pkg/environment" "github.com/threefoldtech/zosbase/pkg/kernel" diff --git a/specs/upgrade.md b/specs/upgrade.md index 74daceb0..6dceb8d9 100644 --- a/specs/upgrade.md +++ b/specs/upgrade.md @@ -8,7 +8,7 @@ The purpose of this document is to discuss how zos should do the following: ## Current status is - We have a single 0-OS image that is updated manually by triggering a new build whenever we feel like it -- The live-upgrading is done using upgraded ([see doc](https://github.com/threefoldtech/zos4/tree/master/docs/upgrade)) and we have a development version of the "upgrade server" at https://versions.dev.grid.tf. This server list all the available version and detail of the flist to use to apply the upgrade +- The live-upgrading is done using upgraded ([see doc](https://github.com/threefoldtech/zos_v4/tree/master/docs/upgrade)) and we have a development version of the "upgrade server" at https://versions.dev.grid.tf. This server list all the available version and detail of the flist to use to apply the upgrade Now with what we have at the moment there is already multiple issues: 1. there is no synchronization between the version publish for upgraded and the 0-OS images diff --git a/tools/zos-update-worker/cmd/worker.go b/tools/zos-update-worker/cmd/worker.go index 44de200a..492c61e6 100644 --- a/tools/zos-update-worker/cmd/worker.go +++ b/tools/zos-update-worker/cmd/worker.go @@ -24,7 +24,7 @@ import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" - "github.com/threefoldtech/zos4/tools/zos-update-version/internal" + "github.com/threefoldtech/zos_v4/tools/zos-update-version/internal" ) var rootCmd = &cobra.Command{ diff --git a/tools/zos-update-worker/go.mod b/tools/zos-update-worker/go.mod index efa8c853..deb8feec 100644 --- a/tools/zos-update-worker/go.mod +++ b/tools/zos-update-worker/go.mod @@ -1,4 +1,4 @@ -module github.com/threefoldtech/zos4/tools/zos-update-version +module github.com/threefoldtech/zos_v4/tools/zos-update-version go 1.23 diff --git a/tools/zos-update-worker/main.go b/tools/zos-update-worker/main.go index 237ef368..421682d7 100644 --- a/tools/zos-update-worker/main.go +++ b/tools/zos-update-worker/main.go @@ -16,7 +16,7 @@ limitations under the License. package main import ( - "github.com/threefoldtech/zos4/tools/zos-update-version/cmd" + "github.com/threefoldtech/zos_v4/tools/zos-update-version/cmd" ) func main() { From e6e0252dc74944edee1dc048542fc57db81d6025 Mon Sep 17 00:00:00 2001 From: ashraffouda Date: Tue, 14 Jul 2026 16:36:44 +0200 Subject: [PATCH 2/2] ci: bump actions/setup-go@v1 -> v5 in host workflows The Set up Go step (setup-go@v1) fails on the current GitHub host runner, blocking Build and upload / Running Daemon Tests before the module-rename build runs. Bump to v5. Container builders untouched. Co-Authored-By: Claude Opus 4.8 (1M context) --- .github/workflows/publish.yaml | 2 +- .github/workflows/test.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 7e7ed948..54b6baeb 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Set up Go 1.21 - uses: actions/setup-go@v1 + uses: actions/setup-go@v5 with: go-version: 1.21 id: go diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index a95376ca..49c69aa0 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Set up Go 1.23 - uses: actions/setup-go@v1 + uses: actions/setup-go@v5 with: go-version: 1.23 id: go