From 423c6e244bb34996e562413b37cd2caacf0e23c0 Mon Sep 17 00:00:00 2001 From: Jeff Haynie Date: Fri, 18 Jul 2025 10:39:20 -0500 Subject: [PATCH 1/3] Fix issue with env on deploy asking for setting when set. Suppress some logs --- cmd/cloud.go | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/cmd/cloud.go b/cmd/cloud.go index f47cd977..8a561339 100644 --- a/cmd/cloud.go +++ b/cmd/cloud.go @@ -244,7 +244,7 @@ Examples: if !context.NewProject { action = func() { - projectData, err = theproject.GetProject(ctx, logger, apiUrl, token, true, false) + projectData, err = theproject.GetProject(ctx, logger, apiUrl, token, false, false) if err != nil { if err == project.ErrProjectNotFound { return @@ -498,10 +498,23 @@ Examples: zipaction := func() { // zip up our directory started := time.Now() + var seenGit, seenNodeModules bool logger.Debug("creating a zip file of %s into %s", dir, tmpfile.Name()) if err := util.ZipDir(dir, tmpfile.Name(), util.WithMutator(zipMutator), util.WithMatcher(func(fn string, fi os.FileInfo) bool { notok := rules.Ignore(fn, fi) if notok { + if strings.HasPrefix(fn, ".git") { + if seenGit { + return false + } + seenGit = true + } + if strings.HasPrefix(fn, "node_modules") { + if seenNodeModules { + return false + } + seenNodeModules = true + } logger.Trace("❌ %s", fn) } else { logger.Trace("❎ %s", fn) From 66e5b6e1e563c166d460afe84e2e4dae6e1d8649 Mon Sep 17 00:00:00 2001 From: Jeff Haynie Date: Fri, 18 Jul 2025 10:41:43 -0500 Subject: [PATCH 2/3] skip venv too --- cmd/cloud.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cmd/cloud.go b/cmd/cloud.go index 8a561339..2110c754 100644 --- a/cmd/cloud.go +++ b/cmd/cloud.go @@ -498,7 +498,7 @@ Examples: zipaction := func() { // zip up our directory started := time.Now() - var seenGit, seenNodeModules bool + var seenGit, seenNodeModules, sendVenv bool logger.Debug("creating a zip file of %s into %s", dir, tmpfile.Name()) if err := util.ZipDir(dir, tmpfile.Name(), util.WithMutator(zipMutator), util.WithMatcher(func(fn string, fi os.FileInfo) bool { notok := rules.Ignore(fn, fi) @@ -515,6 +515,12 @@ Examples: } seenNodeModules = true } + if strings.HasPrefix(fn, ".venv") { + if sendVenv { + return false + } + sendVenv = true + } logger.Trace("❌ %s", fn) } else { logger.Trace("❎ %s", fn) From 805577942c02d43920431192fa4a5a56bd056a24 Mon Sep 17 00:00:00 2001 From: Jeff Haynie Date: Fri, 18 Jul 2025 11:01:07 -0500 Subject: [PATCH 3/3] fix spelling --- cmd/cloud.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/cloud.go b/cmd/cloud.go index 2110c754..da820403 100644 --- a/cmd/cloud.go +++ b/cmd/cloud.go @@ -498,7 +498,7 @@ Examples: zipaction := func() { // zip up our directory started := time.Now() - var seenGit, seenNodeModules, sendVenv bool + var seenGit, seenNodeModules, seenVenv bool logger.Debug("creating a zip file of %s into %s", dir, tmpfile.Name()) if err := util.ZipDir(dir, tmpfile.Name(), util.WithMutator(zipMutator), util.WithMatcher(func(fn string, fi os.FileInfo) bool { notok := rules.Ignore(fn, fi) @@ -516,10 +516,10 @@ Examples: seenNodeModules = true } if strings.HasPrefix(fn, ".venv") { - if sendVenv { + if seenVenv { return false } - sendVenv = true + seenVenv = true } logger.Trace("❌ %s", fn) } else {