Add go fix to CI, rm old build tags

kolyshkin · kolyshkin · commit 05af791c3e10 · 2024-09-13T13:35:21.000-07:00
Add running "go fix" to CI.

Also, remove tidy target from the Makefile (developers hardly use it),
replacing it with

	make foreach CMD="go mod tidy"

Signed-off-by: Kir Kolyshkin &lt;kolyshkin@gmail.com&gt;
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -21,7 +21,11 @@ jobs:
         echo 'PACKAGES="mountinfo mount sequential signal symlink user"' >> $GITHUB_ENV
     - name: go mod tidy
       run: |
-        make tidy
+        make foreach CMD="go mod tidy"
+        git diff --exit-code
+    - name: go fix
+      run: |
+        make foreach CMD="go fix"
         git diff --exit-code
     - name: Lint
       run: make lint
diff --git a/Makefile b/Makefile
@@ -28,10 +28,6 @@ test: test-local
 test: CMD=go test $(RUN_VIA_SUDO) -v .
 test: foreach
 
-.PHONY: tidy
-tidy: CMD=go mod tidy
-tidy: foreach
-
 # Test the mount module against the local mountinfo source code instead of the
 # release specified in its go.mod. This allows catching regressions / breaking
 # changes in mountinfo.
diff --git a/mount/flags_bsd.go b/mount/flags_bsd.go
@@ -1,5 +1,4 @@
 //go:build freebsd || openbsd
-// +build freebsd openbsd
 
 package mount
 
diff --git a/mount/flags_unix.go b/mount/flags_unix.go
@@ -1,5 +1,4 @@
 //go:build !darwin && !windows
-// +build !darwin,!windows
 
 package mount
 
diff --git a/mount/mount_errors.go b/mount/mount_errors.go
@@ -1,5 +1,4 @@
 //go:build !darwin && !windows
-// +build !darwin,!windows
 
 package mount
 
diff --git a/mount/mount_unix.go b/mount/mount_unix.go
@@ -1,5 +1,4 @@
 //go:build !darwin && !windows
-// +build !darwin,!windows
 
 package mount
 
diff --git a/mount/mount_unix_test.go b/mount/mount_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !darwin && !windows
-// +build !darwin,!windows
 
 package mount
 
diff --git a/mount/mounter_freebsd.go b/mount/mounter_freebsd.go
@@ -1,5 +1,4 @@
 //go:build freebsd && cgo
-// +build freebsd,cgo
 
 package mount
 
diff --git a/mount/mounter_openbsd.go b/mount/mounter_openbsd.go
@@ -1,5 +1,4 @@
 //go:build openbsd && cgo
-// +build openbsd,cgo
 
 /*
    Due to how OpenBSD mount(2) works, filesystem types need to be
diff --git a/mount/mounter_unsupported.go b/mount/mounter_unsupported.go
@@ -1,5 +1,4 @@
 //go:build (!linux && !freebsd && !openbsd && !windows && !darwin) || (freebsd && !cgo) || (openbsd && !cgo)
-// +build !linux,!freebsd,!openbsd,!windows,!darwin freebsd,!cgo openbsd,!cgo
 
 package mount
 
diff --git a/mountinfo/mounted_unix.go b/mountinfo/mounted_unix.go
@@ -1,5 +1,4 @@
 //go:build linux || freebsd || openbsd || darwin
-// +build linux freebsd openbsd darwin
 
 package mountinfo
 
diff --git a/mountinfo/mountinfo_bsd.go b/mountinfo/mountinfo_bsd.go
@@ -1,5 +1,4 @@
 //go:build freebsd || openbsd || darwin
-// +build freebsd openbsd darwin
 
 package mountinfo
 
diff --git a/mountinfo/mountinfo_freebsdlike.go b/mountinfo/mountinfo_freebsdlike.go
@@ -1,5 +1,4 @@
 //go:build freebsd || darwin
-// +build freebsd darwin
 
 package mountinfo
 
diff --git a/mountinfo/mountinfo_test.go b/mountinfo/mountinfo_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package mountinfo
 
diff --git a/mountinfo/mountinfo_unsupported.go b/mountinfo/mountinfo_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux && !freebsd && !openbsd && !darwin
-// +build !windows,!linux,!freebsd,!openbsd,!darwin
 
 package mountinfo
 
diff --git a/sequential/sequential_unix.go b/sequential/sequential_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package sequential
 
diff --git a/signal/signal_linux.go b/signal/signal_linux.go
@@ -1,5 +1,4 @@
 //go:build !mips && !mipsle && !mips64 && !mips64le
-// +build !mips,!mipsle,!mips64,!mips64le
 
 package signal
 
diff --git a/signal/signal_linux_mipsx.go b/signal/signal_linux_mipsx.go
@@ -1,6 +1,4 @@
 //go:build linux && (mips || mipsle || mips64 || mips64le)
-// +build linux
-// +build mips mipsle mips64 mips64le
 
 package signal
 
diff --git a/signal/signal_linux_test.go b/signal/signal_linux_test.go
@@ -1,5 +1,4 @@
 //go:build darwin || linux
-// +build darwin linux
 
 package signal
 
diff --git a/signal/signal_unix.go b/signal/signal_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package signal
 
diff --git a/signal/signal_unsupported.go b/signal/signal_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux && !darwin && !freebsd && !windows
-// +build !linux,!darwin,!freebsd,!windows
 
 package signal
 
diff --git a/symlink/fs_unix.go b/symlink/fs_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package symlink
 
diff --git a/symlink/fs_unix_test.go b/symlink/fs_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 // Licensed under the Apache License, Version 2.0; See LICENSE.APACHE
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build freebsd \|\| openbsd`
`2`		`-// +build freebsd openbsd`
`3`	`2`
`4`	`3`	`package mount`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build !darwin && !windows`
`2`		`-// +build !darwin,!windows`
`3`	`2`
`4`	`3`	`package mount`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build freebsd && cgo`
`2`		`-// +build freebsd,cgo`
`3`	`2`
`4`	`3`	`package mount`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build openbsd && cgo`
`2`		`-// +build openbsd,cgo`
`3`	`2`
`4`	`3`	`/*`
`5`	`4`	`Due to how OpenBSD mount(2) works, filesystem types need to be`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build (!linux && !freebsd && !openbsd && !windows && !darwin) \|\| (freebsd && !cgo) \|\| (openbsd && !cgo)`
`2`		`-// +build !linux,!freebsd,!openbsd,!windows,!darwin freebsd,!cgo openbsd,!cgo`
`3`	`2`
`4`	`3`	`package mount`
`5`	`4`