Merge pull request #218 from crazy-max/lint-multi-platform

enable golangci-lint for supported platforms

.github/workflows/ci.yml

@@ -22,7 +22,7 @@ jobs:
     strategy:
       matrix:
         target:
-          - lint
+          - lint-cross
           - validate-generated-files
           - validate-gomod
           - validate-shfmt

.golangci.yml

@@ -1,7 +1,5 @@
 run:
-  timeout: 10m
-  skip-files:
-    - ".*\\.pb\\.go$"
+  timeout: 30m
 
 linters:
   enable:
@@ -25,6 +23,10 @@ linters-settings:
           - pkg: "io/ioutil"
             desc: The io/ioutil package has been deprecated.
 
-# show all
-max-issues-per-linter: 0
-max-same-issues: 0
+issues:
+  exclude-files:
+    - ".*\\.pb\\.go$"
+
+  # show all
+  max-issues-per-linter: 0
+  max-same-issues: 0

chtimes_nolinux.go

@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 package fsutil

copy/copy_test.go

@@ -18,15 +18,6 @@ import (
 	"github.com/tonistiigi/fsutil"
 )
 
-// requiresRoot skips tests that require root
-func requiresRoot(t *testing.T) {
-	t.Helper()
-	if os.Getuid() != 0 {
-		t.Skip("skipping test that requires root")
-		return
-	}
-}
-
 // TODO: Create copy directory which requires privilege
 //  chown
 //  mknod

copy/copy_unix_test.go

@@ -161,3 +161,12 @@ func TestCopyModeTextFormat(t *testing.T) {
 		})
 	}
 }
+
+// requiresRoot skips tests that require root
+func requiresRoot(t *testing.T) {
+	t.Helper()
+	if os.Getuid() != 0 {
+		t.Skip("skipping test that requires root")
+		return
+	}
+}

copy/stat_bsd.go

@@ -1,3 +1,4 @@
+//go:build darwin || freebsd || netbsd
 // +build darwin freebsd netbsd
 
 package fs

copy/stat_openbsd.go

@@ -1,3 +1,4 @@
+//go:build openbsd
 // +build openbsd
 
 package fs

docker-bake.hcl

@@ -6,6 +6,25 @@ variable "DESTDIR" {
   default = "./bin"
 }
 
+target "_platforms" {
+  platforms = [
+    "darwin/amd64",
+    "darwin/arm64",
+    "freebsd/amd64",
+    "freebsd/arm64",
+    "linux/386",
+    "linux/amd64",
+    "linux/arm",
+    "linux/arm64",
+    "linux/ppc64le",
+    "linux/s390x",
+    "openbsd/amd64",
+    "openbsd/arm64",
+    "windows/amd64",
+    "windows/arm64"
+  ]
+}
+
 group "default" {
   targets = ["build"]
 }
@@ -40,6 +59,10 @@ target "lint" {
   }
 }
 
+target "lint-cross" {
+  inherits = ["lint", "_platforms"]
+}
+
 target "validate-generated-files" {
   dockerfile = "./hack/dockerfiles/generated-files.Dockerfile"
   output = ["type=cacheonly"]
@@ -86,21 +109,5 @@ target "shfmt" {
 }
 
 target "cross" {
-  inherits = ["build"]
-  platforms = [
-    "linux/amd64",
-    "linux/386",
-    "linux/arm64",
-    "linux/arm",
-    "linux/ppc64le",
-    "linux/s390x",
-    "darwin/amd64",
-    "darwin/arm64",
-    "windows/amd64",
-    "windows/arm64",
-    "freebsd/amd64",
-    "freebsd/arm64",
-    "openbsd/amd64",
-    "openbsd/arm64"
-  ]
+  inherits = ["build", "_platforms"]
 }

hack/dockerfiles/lint.Dockerfile

@@ -1,15 +1,20 @@
 # syntax=docker/dockerfile:1
 
 ARG GO_VERSION=1.23
+ARG XX_VERSION=1.5.0
 ARG GOLANGCI_LINT_VERSION=1.61.0
 
-FROM golang:${GO_VERSION}-alpine
+FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
+FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-alpine
 RUN apk add --no-cache git gcc musl-dev
 ENV GOFLAGS="-buildvcs=false"
 ARG GOLANGCI_LINT_VERSION
 RUN wget -O- -nv https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v${GOLANGCI_LINT_VERSION}
+COPY --link --from=xx / /
 WORKDIR /go/src/github.com/tonistiigi/fsutil
+ARG TARGETPLATFORM
 RUN --mount=target=. \
-    --mount=target=/root/.cache,type=cache \
+    --mount=target=/root/.cache,type=cache,id=lint-cache-$TARGETPLATFORM \
     --mount=target=/go/pkg/mod,type=cache \
+    xx-go --wrap && \
     golangci-lint run

stat_windows.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package fsutil