Run lint for mac builds

There are darwin-specific code paths which were not being linted prior to this commit. Fix this with a new, darwin-specific section of the lint runner script. Signed-off-by: Chris Evich <[email protected]>
containers · Feb 1, 2024 · d9ad7cb · d9ad7cb
1 parent 4fde98f
commit d9ad7cb
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -466,6 +466,8 @@ osx_alt_build_task:
     # This host is/was shared with potentially many other CI tasks.
     # The previous task may have been canceled or aborted.
     prep_script: &mac_cleanup "contrib/cirrus/mac_cleanup.sh"
+    lint_script:
+        - make lint
     basic_build_script:
         - make .install.ginkgo
         - make podman-remote

diff --git a/hack/golangci-lint.sh b/hack/golangci-lint.sh
@@ -3,6 +3,28 @@
 # Need to run linter twice to cover all the build tags code paths
 set -e
 
+# Dedicated block for Darwin: OS doesn't support the rest of this
+# script, only needs to check 'remote', and its golangci-lint needs
+# specialized arguments.
+if [[ $(uname -s) == "Darwin" ]] || [[ "$GOOS" == "darwin" ]]; then
+  declare -a DARWIN_SKIP_DIRS
+  DARWIN_SKIP_DIRS=(
+    libpod/events
+    pkg/api
+    pkg/domain/infra/abi
+    pkg/machine/qemu
+    pkg/trust
+    test
+  )
+  echo ""
+  echo Running golangci-lint for "remote"
+  echo Build Tags          "remote": remote
+  echo Skipped directories "remote": ${DARWIN_SKIP_DIRS[*]}
+  ./bin/golangci-lint run --build-tags="remote" \
+    --skip-dirs=$(tr ' ' ',' <<<"${DARWIN_SKIP_DIRS[@]}")
+  exit 0  # All done, don't execute anything below, it will break on Darwin
+fi
+
 declare -A BUILD_TAGS
 BUILD_TAGS[default]="apparmor,seccomp,selinux"
 BUILD_TAGS[abi]="${BUILD_TAGS[default]},systemd"