Skip to content

Commit 366fb51

Browse files
committed
ci: add mac os to matrix tests
Signed-off-by: Boris Glimcher <[email protected]>
1 parent 0b9cc3b commit 366fb51

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

.github/workflows/test.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
fail-fast: false
1111
matrix:
1212
go: [ '1.19', '1.20', '1.21' ]
13-
os: [windows-latest, ubuntu-latest]
13+
os: [windows-latest, macos-latest, ubuntu-latest]
1414
runs-on: ${{ matrix.os }}
1515
steps:
1616
- uses: actions/checkout@v4
@@ -25,6 +25,12 @@ jobs:
2525
version: v1.15.0
2626
install-only: true
2727

28+
- name: Setup docker (missing on MacOS)
29+
if: contains(runner.os, 'macos')
30+
run: |
31+
brew install docker
32+
colima start
33+
2834
- run: |
2935
go version
3036
go env

magefiles/test.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,14 +105,15 @@ func testImpl(impl string) (err error) {
105105
return errors.New("unknown `gokv.Store` implementation")
106106
}
107107

108-
// TODO: until docker images for windows appear, skip those test for windows
109-
if dockerImage != "" && runtime.GOOS == "windows" {
110-
return nil
111-
}
112-
113108
// For some implementations there's no way to test with a Docker container yet.
114109
// For them we skip the Docker stuff but still execute the tests, which can skip on connection error and we can see the skips in the test results.
115110
if dockerImage != "" {
111+
112+
// TODO: until docker images for windows and darwin appear, skip those tests
113+
if runtime.GOOS == "windows" || runtime.GOOS == "darwin" {
114+
return nil
115+
}
116+
116117
// Pull Docker image
117118
fmt.Printf("Pulling Docker image %s...", dockerImage)
118119
var out string

0 commit comments

Comments
 (0)