Skip to content

Commit

Permalink
bump dependencies (primaza#29)
Browse files Browse the repository at this point in the history
Signed-off-by: Andy Sadler <ansadler@redhat.com>
  • Loading branch information
sadlerap committed Feb 14, 2023
1 parent 60820a0 commit 2aa8ffa
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions hack/check-conflicts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ while IFS='' read -r file; do
check_file "$file" || ((overall_failed++))
done < <(git ls-tree --full-tree -r HEAD --name-only | grep -v "vendor/" )

if [ $overall_failed -eq 0 ]; then
if [ "${overall_failed}" -eq 0 ]; then
echo -e "\nNone of the tracked or staged files contain strings indicating a git conflict... PASS\n"
else
echo -e "\nThe above listed files contains strings indicating a git conflict... FAIL\n"
fi
exit $overall_failed
exit "${overall_failed}"
4 changes: 2 additions & 2 deletions make/deps.mk
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
ENVTEST ?= $(LOCALBIN)/setup-envtest

## Tool Versions
KUSTOMIZE_VERSION ?= v4.5.7
CONTROLLER_TOOLS_VERSION ?= v0.10.0
KUSTOMIZE_VERSION ?= v5.0.0
CONTROLLER_TOOLS_VERSION ?= v0.11.3

KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
.PHONY: kustomize
Expand Down
2 changes: 1 addition & 1 deletion make/linters.mk
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
##@ Linters

GOLANGCI_LINT=$(LOCALBIN)/golangci-lint
GOLANGCI_LINT_VERSION ?= v1.50.1
GOLANGCI_LINT_VERSION ?= v1.51.1

YAMLLINT_VERSION ?= 1.28.0

Expand Down

0 comments on commit 2aa8ffa

Please sign in to comment.