Skip to content

Commit 6e8aba8

Browse files
authored
Merge pull request #220 from gofiber/codex/2025-10-10-13-58-28
2 parents 5663dee + 182f9b5 commit 6e8aba8

File tree

2 files changed

+18
-0
lines changed

2 files changed

+18
-0
lines changed

cmd/internal/go_mod.go

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ func RunGoMod(root string) error {
3030
for _, dir := range dirs {
3131
for _, args := range commands {
3232
cmd := ExecCommand(args[0], args[1:]...) // #nosec G204 -- commands are controlled
33+
setGoWorkOffEnv(cmd)
3334
cmd.Dir = dir
3435
if err := runCmd(cmd); err != nil {
3536
return fmt.Errorf("in %s: %w", dir, err)
@@ -39,6 +40,21 @@ func RunGoMod(root string) error {
3940
return nil
4041
}
4142

43+
func setGoWorkOffEnv(cmd *exec.Cmd) {
44+
env := append([]string{}, os.Environ()...)
45+
if len(cmd.Env) > 0 {
46+
env = append(env, cmd.Env...)
47+
}
48+
filtered := make([]string, 0, len(env)+1)
49+
for _, e := range env {
50+
if !strings.HasPrefix(e, "GOWORK=") {
51+
filtered = append(filtered, e)
52+
}
53+
}
54+
filtered = append(filtered, "GOWORK=off")
55+
cmd.Env = filtered
56+
}
57+
4258
// fiberModuleDirs returns directories under root containing a go.mod file that
4359
// requires github.com/gofiber/fiber. vendor directories are skipped.
4460
func fiberModuleDirs(root string) ([]string, error) {

cmd/migrate_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,8 @@ require github.com/gofiber/fiber/v2 v2.0.0`
233233
assert.Len(t, cmds, 3)
234234
for _, c := range cmds {
235235
assert.Equal(t, dir, c.Dir)
236+
assert.Contains(t, c.Env, "GO_WANT_HELPER_PROCESS=1")
237+
assert.Contains(t, c.Env, "GOWORK=off")
236238
}
237239

238240
cmds = nil

0 commit comments

Comments
 (0)