Skip to content
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

Run lint for mac builds #21372

Merged
merged 2 commits into from
Feb 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 || true # TODO: Enable when code passes check
basic_build_script:
- make .install.ginkgo
- make podman-remote
Expand Down
22 changes: 22 additions & 0 deletions hack/golangci-lint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

cevich marked this conversation as resolved.
Show resolved Hide resolved
declare -A BUILD_TAGS
BUILD_TAGS[default]="apparmor,seccomp,selinux"
BUILD_TAGS[abi]="${BUILD_TAGS[default]},systemd"
Expand Down
Loading