Skip to content

Commit

Permalink
build: bump mutagen to 0.18.0 (ddev#6648)
Browse files Browse the repository at this point in the history
  • Loading branch information
rfay authored Oct 25, 2024
1 parent 4de6507 commit 64b7a80
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 7 deletions.
20 changes: 14 additions & 6 deletions pkg/testcommon/testcommon_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@ package testcommon

import (
"fmt"
"os"
"path/filepath"
"runtime"
"testing"

"github.com/ddev/ddev/pkg/ddevapp"
"github.com/ddev/ddev/pkg/dockerutil"
"github.com/ddev/ddev/pkg/exec"
"github.com/ddev/ddev/pkg/globalconfig"
"github.com/ddev/ddev/pkg/nodeps"
asrt "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"os"
"path/filepath"
"runtime"
"testing"
"time"
)

var DdevBin = "ddev"
Expand Down Expand Up @@ -230,7 +230,7 @@ func TestPretestAndEnv(t *testing.T) {
site := TestSites[0]
site.Name = t.Name()

_, _ = exec.RunCommand(DdevBin, []string{"stop", "-RO", site.Name})
_, _ = exec.RunCommand(DdevBin, []string{"delete", "-Oy", site.Name})

site.WebEnvironment = []string{"SOMEVAR=somevar"}
site.PretestCmd = fmt.Sprintf("%s exec 'touch /var/tmp/%s'", DdevBin, t.Name())
Expand All @@ -255,6 +255,14 @@ func TestPretestAndEnv(t *testing.T) {
assert.NoError(err)
})

if runtime.GOOS == "windows" && app.IsMutagenEnabled() {
// We can't replace mutagen.exe on windows if anything has been using it
ddevapp.PowerOff()
err = ddevapp.MutagenReset(app)
require.NoError(t, err)
time.Sleep(1000 * time.Millisecond)
}

err = app.Start()
require.NoError(t, err)
somevar, _, err := app.Exec(&ddevapp.ExecOpts{
Expand Down
2 changes: 1 addition & 1 deletion pkg/versionconstants/versionconstants.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ var BUILDINFO = "BUILDINFO should have new info"
// MutagenVersion is filled with the version we find for Mutagen in use
var MutagenVersion = ""

const RequiredMutagenVersion = "0.17.2"
const RequiredMutagenVersion = "0.18.0"

const RequiredDockerComposeVersionDefault = "v2.29.7"

Expand Down

0 comments on commit 64b7a80

Please sign in to comment.