Add merge GitHub Actions workflow to run tests on Windows and macOS runners
#9863
Conversation
Signed-off-by: Laura Brehm <[email protected]>
Signed-off-by: Laura Brehm <[email protected]>
Fixes error when attempting to run `uname` on Windows, and add `.exe` to built binary on `make` if on Windows Signed-off-by: Laura Brehm <[email protected]>
Signed-off-by: Laura Brehm <[email protected]>
Signed-off-by: Laura Brehm <[email protected]>
Signed-off-by: Laura Brehm <[email protected]>
Signed-off-by: Laura Brehm <[email protected]>
| @@ -1,3 +1,6 @@ | |||
| //go:build !windows | |||
| // +build !windows | |||
There was a problem hiding this comment.
This test does not compile on Windows due to:
cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}and surrounding logic
There was a problem hiding this comment.
Ah yeah, we've dealt with this same thing before in Tilt 🙃
What we can do is make a func SetProcessPgid(cmd *exec.Cmd) in proc_windows.go that's a no-op and proc_unix.go that does the code ⬆️ and then call the helper. Annoying but 🤷
(IIRC Windows always has the desired behavior re: killing process groups)
| @@ -29,6 +30,9 @@ import ( | |||
| ) | |||
|
|
|||
| func TestPause(t *testing.T) { | |||
| if _, ok := os.LookupEnv("CI"); ok { | |||
| t.Skip("Skipping test on CI... flaky") | |||
There was a problem hiding this comment.
This test was really flaky on CI, so I think it's best to just skip it there for now until we can harden it. Fwiw, it seems to be a performance issue, as it always passes on the M1 mac, but is flaky on the Intel mac and on the Windows runners.
| @@ -135,6 +135,9 @@ func TestDownComposefileInParentFolder(t *testing.T) { | |||
| } | |||
|
|
|||
| func TestAttachRestart(t *testing.T) { | |||
| if _, ok := os.LookupEnv("CI"); ok { | |||
| t.Skip("Skipping test on CI... flaky") | |||
There was a problem hiding this comment.
Same for this test, and same regarding always passing on the M1 mac but being flaky on the Intel mac/Windows runner.
There was a problem hiding this comment.
Oof yeah I've been 👀 this test for a while, might take a look tomorrow to see if I can figure out where the race is
There was a problem hiding this comment.
(To be clear though, I'm in favor of merging this with the Skip() and deal with cleanup after!)
| @@ -18,13 +18,20 @@ VERSION ?= $(shell git describe --match 'v[0-9]*' --dirty='.m' --always --tags) | |||
| GO_LDFLAGS ?= -s -w -X ${PKG}/internal.Version=${VERSION} | |||
| GO_BUILDTAGS ?= e2e,kube | |||
|
|
|||
| UNAME_S := $(shell uname -s) | |||
| ifeq ($(UNAME_S),Linux) | |||
There was a problem hiding this comment.
Running $(shell uname -s) on Windows breaks, so we only do it if we're not on Windows
| MOBY_DOCKER=/Applications/Docker.app/Contents/Resources/bin/docker | ||
| endif | ||
| ifeq ($(DETECTED_OS),Windows) | ||
| BINARY_EXT=.exe | ||
| endif |
There was a problem hiding this comment.
make was previously not adding .exe to the docker-compose binary built on Windows 😅 (thanks for looking at that @milas)
| func TestBuildSSH(t *testing.T) { | ||
| if runtime.GOOS == "windows" { | ||
| t.Skip("Running on Windows. Skipping...") | ||
| } |
There was a problem hiding this comment.
I split out the SSH tests out so I could disable them on Windows -- they were failing with:
Invalid empty ssh agent socket: Windows OpenSSH agent not available at \\.\pipe\openssh-ssh-agent. Enable the SSH agent service or set SSH_AUTH_SOCK.
We can take a look at that later, maybe set up an SSH agent on the Windows runner and re-enable these
There was a problem hiding this comment.
Windows does have a built-in OpenSSH Agent nowadays, so it's fairly straightforward to enable in services.msc if we want
| func TestBuildSecrets(t *testing.T) { | ||
| if runtime.GOOS == "windows" { | ||
| t.Skip("skipping test on windows") | ||
| } |
There was a problem hiding this comment.
I'm slightly surprised this test is failing on Windows! Should be a fun one to investigate 🙈
Signed-off-by: Laura Brehm <[email protected]>
Signed-off-by: Laura Brehm <[email protected]>
What I did
Add GitHub Actions workflow
mergeto run unit/e2e tests on Windows and Mac runners, after PRs are merged tov2and when tags such asv*are pushed.Removed
/rebaseaction since this is no longer necessary.(not mandatory) A picture of a cute animal, if possible in relation with what you did