-
Notifications
You must be signed in to change notification settings - Fork 123
Update GHA for matrix build #151
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
Per suggestion in #97 |
Let CI run. |
CI is unhappy. |
I'd love to see this merged! If it helps, the build fix is trivial: diff --git a/diskfs_unix.go b/diskfs_unix.go
index 31a94a4..3f364e1 100644
--- a/diskfs_unix.go
+++ b/diskfs_unix.go
@@ -1,5 +1,5 @@
-//go:build !darwin || linux || solaris || aix || freebsd || illumos || netbsd || openbsd || plan9
-// +build !darwin linux solaris aix freebsd illumos netbsd openbsd plan9
+//go:build linux || solaris || aix || freebsd || illumos || netbsd || openbsd || plan9
+// +build linux solaris aix freebsd illumos netbsd openbsd plan9
package diskfs A manual check with: GOOS=darwin go build
GOOS=windows go build
GOOS=linux go build Confirms that at least the build passes (not actually tested on target, though) If it helps, I can open a PR for this fix, but it would be completely OK with me to just apply directly it on this PR! |
Either fix is fine. I am happy to see this merged in once CI is clean. |
@rpunt would you be interested in integrating this proposed fix in your PR ? |
CI is unhappy about something. Also, should squash into a single commit. |
It looks like the CI is unhappy because docker is not installed on the macos image. This somehow makes sense because the docker image would run in Linux VM under the hood, which is strictly equivalent to just run on Linux directly 😄 Since the Makefile and the test suite already make it easily possible to select whether we want to run the docker-based tests or not, maybe a good approach could be:
Would this approach make sense ? I'm not familiar with GitHub actions, so I'm not sure if this could be implemented. |
We may not have much of a choice. Much as I would want OK, let's go with your approach:
And squash the commits. The easiest may be to add an - name: unit-test
run: make unit-test
- name: image
if: ${{ runner.os == "Linux" }}
run: make image
- name: test
if: ${{ runner.os == "Linux" }}
run: make test You could use |
squashed and updated |
CI finally passed, with both the additions suggested for Docker images, and by skipping Windows runs for "vet" and "lint" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks good, except for the irrelevant Makefile changes. Some impelemntations might not like them either; arguably non-target-specific syntax is not supposed to be tab-indented. I have seen make versions where the following would get ignored:
ifeq ($(BUILDARCH),aarch64)
BUILDARCH=arm64
endif
but not:
ifeq ($(BUILDARCH),aarch64)
BUILDARCH=arm64
endif
Either way, it is irrelevant to this PR, so please remove, and then we can merge in.
30bc487
to
973e368
Compare
No description provided.