ci: run on mac and windows (#24)

* ci: run on mac and windows * ci: forgot windows * windows: fix some tests
shoenig · Feb 19, 2023 · 9ecee7f · 9ecee7f
1 parent 4d17c5f
commit 9ecee7f
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 5 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -2,9 +2,17 @@ name: Run CI Tests
 on: [push]
 jobs:
   run-tests:
-    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-20.04
+          - ubuntu-22.04
+          - macos-12
+          - windows-2022
+    runs-on: ${{matrix.os}}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: hashicorp/setup-golang@v1
         with:
           version-file: go.mod

diff --git a/internal/commands/exec_test.go b/internal/commands/exec_test.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"os"
+	"runtime"
 	"testing"
 
 	"github.com/google/subcommands"
@@ -15,6 +16,13 @@ import (
 	"github.com/shoenig/test/must"
 )
 
+func skipOS(t *testing.T) {
+	switch runtime.GOOS {
+	case "windows":
+		t.Skip("skipping on windows")
+	}
+}
+
 func TestExecCmd_Ops(t *testing.T) {
 	db := newDBFile(t)
 	defer cleanupFile(t, db)
@@ -28,6 +36,8 @@ func TestExecCmd_Ops(t *testing.T) {
 }
 
 func TestExecCmd_Execute(t *testing.T) {
+	skipOS(t)
+
 	box := safe.NewBoxMock(t)
 	defer box.MinimockFinish()
 
@@ -134,7 +144,13 @@ func TestExecCmd_Execute_badCommand(t *testing.T) {
 
 	must.Eq(t, subcommands.ExitFailure, rc)
 	must.Eq(t, "", a.String())
-	must.Eq(t, "envy: failed to exec: fork/exec /does/not/exist: no such file or directory\n", b.String())
 	must.Eq(t, "", c.String())
 	must.Eq(t, "", d.String())
+
+	switch runtime.GOOS {
+	case "windows":
+		must.Eq(t, "envy: failed to exec: exec: \"/does/not/exist\": file does not exist\n", b.String())
+	default:
+		must.Eq(t, "envy: failed to exec: fork/exec /does/not/exist: no such file or directory\n", b.String())
+	}
 }
diff --git a/internal/safe/safe_test.go b/internal/safe/safe_test.go
@@ -2,7 +2,7 @@ package safe
 
 import (
 	"io/ioutil"
-	"strings"
+	"runtime"
 	"testing"
 
 	"github.com/shoenig/ignore"
@@ -15,7 +15,13 @@ func TestSafe_Path(t *testing.T) {
 	t.Run("default", func(t *testing.T) {
 		p, err := Path("")
 		must.NoError(t, err)
-		must.True(t, strings.HasSuffix(p, "/envy/envy.safe"))
+
+		switch runtime.GOOS {
+		case "windows":
+			must.StrHasSuffix(t, `\envy\envy.safe`, p)
+		default:
+			must.StrHasSuffix(t, "/envy/envy.safe", p)
+		}
 	})
 
 	t.Run("non-default", func(t *testing.T) {