Page MenuHomeFreeBSD

sysutils/containers-common: fix source build outside poudriere
AcceptedPublic

Authored by dch on Tue, Oct 21, 10:14 AM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Nov 12, 6:05 PM
Unknown Object (File)
Tue, Nov 11, 4:42 PM
Unknown Object (File)
Mon, Nov 10, 11:29 PM
Unknown Object (File)
Sat, Nov 8, 12:59 PM
Unknown Object (File)
Fri, Nov 7, 4:54 PM
Unknown Object (File)
Fri, Nov 7, 11:54 AM
Unknown Object (File)
Fri, Nov 7, 11:54 AM
Unknown Object (File)
Fri, Nov 7, 6:45 AM
Subscribers
None

Details

Reviewers
dfr
Summary

Reported by: Robert Gogolok mastodon.bsd.cafe/@gogo
Obtained from: bapt
Sponsored by: SkunkWerks, GmbH

Diff Detail

Lint
Lint Skipped
Unit
Tests Skipped
Build Status
Buildable 67953
Build 64836: arc lint + arc unit

Event Timeline

dch requested review of this revision.Tue, Oct 21, 10:14 AM
dch created this revision.

TLDR don't run golangci-lint as part of the build.

This was reported via mastodon for a user building from sources / make (i.e. not in poudriere).

Baptiste cooked up a patch, but because the sources live outside $WRKSRC the ports tree
doesn't know how to patch them, so .. sed instead. If you can think of a smarter way I'm
all ears.

diff
diff --git a/sysutils/containers-common/files/patch-tests_tools_Makefile b/sysutils/containers-common/files/patch-tests_tools_Makefile
new file mode 100644
index 000000000000..8fbd9833a463
--- /dev/null
+++ b/sysutils/containers-common/files/patch-tests_tools_Makefile
@@ -0,0 +1,12 @@
+--- tests/tools/Makefile.orig  2025-08-01 18:26:00 UTC
++++ tests/tools/Makefile
+@@ -20,8 +20,7 @@ $(BUILDDIR): \
+
+ $(BUILDDIR): \
+       $(BUILDDIR)/git-validation \
+-      $(BUILDDIR)/go-md2man \
+-      $(BUILDDIR)/golangci-lint
++      $(BUILDDIR)/go-md2man
+
+ $(BUILDDIR)/git-validation:
+       $(call go-build,./vendor/github.com/vbatts/git-validation)

Seems reasonable. We don't need to lint the source every time we build it - the upstream CI forces lint checks already.

This revision is now accepted and ready to land.Fri, Oct 24, 1:53 PM