Merge branch 'master' into fix-liberica-macos-integration

# Conflicts:
#	.github/workflows/tests.yml
#	bin/functions

Author: delgurth

.github/workflows/tests.yml

@@ -36,6 +36,15 @@ jobs:
       run: |
         . asdf/asdf.sh
         asdf plugin-test java "$GITHUB_WORKSPACE" --asdf-plugin-gitref "$GITHUB_SHA" --asdf-tool-version adoptopenjdk-8.0.252+9.1.openj9-0.20.0 java -version
+    - name: macOS Check java_home integration
+      if: matrix.os == 'macOS-latest'
+      env:
+        GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: |
+        export ASDF_CONFIG_FILE=${HOME}"/.asdfrc"
+        echo "java_macos_integration_enable = yes" > "${ASDF_CONFIG_FILE}"
+        . asdf/asdf.sh
+        asdf plugin-test java "$GITHUB_WORKSPACE" --asdf-plugin-gitref "$GITHUB_SHA" --asdf-tool-version zulu-8.52.0.23 /usr/libexec/java_home -V 2>&1 | grep "Zulu 8.52.0.23"
     - name: macOS Check java_home integration Liberica
       if: matrix.os == 'macOS-latest'
       env:

.github/workflows/update-data.yaml

@@ -5,6 +5,7 @@ on:
     - cron: '30 */8 * * *'
 jobs:
   update:
+    if: github.repository == 'halcyon/asdf-java'
     runs-on: 'ubuntu-latest'
     steps:
     - uses: actions/checkout@v2

bin/functions

@@ -145,7 +145,7 @@ function install {
                     mv ./* "${ASDF_INSTALL_PATH}" 
                     if [[ "$(get_asdf_config_value "java_macos_integration_enable")" = "yes" ]]; then
                         local macOS_integration_path
-                        macOS_integration_path="$(dirname "$(dirname "$(dirname "$(absolute_dir_path "${ASDF_INSTALL_PATH}/release")")")")"
+                        macOS_integration_path="$(dirname "$(dirname "$(dirname "$(absolute_dir_path "${ASDF_INSTALL_PATH}/bin/..")")")")"
                         java_macos_integration_install "$macOS_integration_path"
                     fi
                     ;;