Merge remote-tracking branch 'origin/foundation-2022' into foundation…

…-2023
OpenNMS · Jun 26, 2023 · 8c4e23e · 8c4e23e
2 parents 208b414 + f3fbe3f
commit 8c4e23e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/auto-assign.yml b/.github/workflows/auto-assign.yml
@@ -1,6 +1,6 @@
 name: "Auto Assign Pull Request"
 on:
-  pull_request:
+  pull_request_target:
     # types: [review_requested, ready_for_review, opened, synchronize, reopened]
     branches:
       - develop

diff --git a/core/cli/src/main/resources/bin/find-java.sh b/core/cli/src/main/resources/bin/find-java.sh
@@ -90,7 +90,7 @@ main() {
 	fi
 
 	if [ "$SKIP_DEFAULTS" -eq 0 ]; then
-		DEFAULTS=(/usr/lib/jvm /usr/java /System/Library/Java/JavaVirtualMachines /Library/Java/JavaVirtualMachines /Library/Java/Home /opt)
+		DEFAULTS=(/usr/lib/jvm /usr/java /System/Library/Java/JavaVirtualMachines /Library/Java/JavaVirtualMachines /Library/Java/Home /opt /usr/lib64/jvm)
 		# this is massively inefficient, but bash sucks and there aren't *that* many entries so it doesn't really matter
 		for default in "${DEFAULTS[@]}"; do
 			found=false