cli: fix broken console output (#891)

* ci: add integration test for vz vm-type * cli: fix broken output for package downloads * cli: re-introduce progress bar * ci: remove vz
abiosoft · Nov 19, 2023 · a3adebf · a3adebf
1 parent a0f923d
commit a3adebf
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -183,4 +183,3 @@ jobs:
 
       - name: Teardown
         run: colima delete -f
-
diff --git a/environment/vm/lima/daemon.go b/environment/vm/lima/daemon.go
@@ -45,9 +45,9 @@ func (l *limaVM) startDaemon(ctx context.Context, conf config.Config) (context.C
 
 	// add network processes to daemon
 	if isQEMU {
-		a.Stage("preparing network")
 		a.Add(func() error {
 			if conf.Network.Address {
+				a.Stage("preparing network")
 				ctx = context.WithValue(ctx, ctxKeyVmnet, true)
 			}
 			deps, root := l.daemon.Dependencies(ctx, conf)

diff --git a/environment/vm/lima/dependencies.go b/environment/vm/lima/dependencies.go
@@ -44,7 +44,7 @@ func (l *limaVM) cacheDependencies(src deb.URISource, log *logrus.Entry, conf co
 	// TODO: extract this into re-usable progress bar for multi-downloads
 	for i, p := range debPackages {
 		// status feedback
-		log.Infof("downloading package %d of %d ...", i+1, len(debPackages))
+		logrus.Infof("downloading package %d of %d ...", i+1, len(debPackages))
 
 		// download
 		if err := l.host.RunInteractive(

diff --git a/environment/vm/lima/yaml.go b/environment/vm/lima/yaml.go
@@ -100,9 +100,8 @@ func newConf(ctx context.Context, conf config.Config) (l Config, err error) {
 		// add user to docker group
 		// "sudo", "usermod", "-aG", "docker", user
 		l.Provision = append(l.Provision, Provision{
-			Mode:           ProvisionModeDependency,
-			Script:         "groupadd -f docker && usermod -aG docker $LIMA_CIDATA_USER",
-			SkipResolution: true,
+			Mode:   ProvisionModeDependency,
+			Script: "groupadd -f docker && usermod -aG docker $LIMA_CIDATA_USER",
 		})
 
 		// set hostname