Skip to content

Commit fab7cb8

Browse files
committed
Minor darwin tweaks for Makefile and CI
Signed-off-by: apostasie <[email protected]>
1 parent 79c23c1 commit fab7cb8

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

.github/workflows/lint.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,15 @@ jobs:
2121
shell: bash
2222
strategy:
2323
fail-fast: false
24+
# Note: technically, `make lint-go-all` will run the linter for all platforns, and could be called on a single instance.
25+
# The point of running it instead on a matrix here is to verify that the tooling itself is working on the target OS.
2426
matrix:
2527
include:
2628
- os: ubuntu-24.04
2729
goos: linux
2830
- os: ubuntu-24.04
2931
goos: freebsd
30-
- os: ubuntu-24.04
31-
goos: darwin
32+
- os: macos-15
3233
# FIXME: this is currently failing in a non-sensical way, so, running on linux instead...
3334
# - os: windows-2022
3435
- os: ubuntu-24.04

Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,9 @@ lint-go-all:
134134
$(call title, $@)
135135
@cd $(MAKEFILE_DIR) \
136136
&& GOOS=linux make lint-go \
137-
&& GOOS=windows make lint-go \
138-
&& GOOS=freebsd make lint-go
137+
&& GOOS=freebsd make lint-go \
138+
&& GOOS=darwin make lint-go \
139+
&& GOOS=windows make lint-go
139140
$(call footer, $@)
140141

141142
lint-yaml:
@@ -179,6 +180,7 @@ lint-licenses-all:
179180
@cd $(MAKEFILE_DIR) \
180181
&& GOOS=linux make lint-licenses \
181182
&& GOOS=freebsd make lint-licenses \
183+
&& GOOS=darwin make lint-licenses \
182184
&& GOOS=windows make lint-licenses
183185
$(call footer, $@)
184186

@@ -196,6 +198,7 @@ fix-go-all:
196198
@cd $(MAKEFILE_DIR) \
197199
&& GOOS=linux make fix-go \
198200
&& GOOS=freebsd make fix-go \
201+
&& GOOS=darwin make fix-go \
199202
&& GOOS=windows make fix-go
200203
$(call footer, $@)
201204

0 commit comments

Comments
 (0)