System Java now works on macOS #142
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| [*] | ||
| indent_style = space | ||
| indent_size = 2 | ||
| insert_final_newline = true | ||
| trim_trailing_whitespace = true | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,10 +16,10 @@ jobs: | |
| TERM: dumb | ||
| steps: | ||
| - uses: actions/checkout@v2 | ||
| - uses: delgurth/get-package@v3 | ||
|
There was a problem hiding this comment. Any specific reason the replace the GitHub Action here? There was a problem hiding this comment. Yes, there was a specific reason, v1 installed packages twice on newer Ubuntu images, once via brew and once via the normal apt-get. mstksg/get-package#5 |
||
| with: | ||
| brew: bash coreutils jq shellcheck fish xonsh zsh | ||
| apt-get: jq shellcheck zsh fish xonsh bash | ||
| - name: Run ShellCheck | ||
| run: | | ||
| shellcheck -V | ||
|
|
@@ -34,14 +34,116 @@ jobs: | |
| env: | ||
| GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| run: | | ||
| . $PWD/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}" | ||
| . $PWD/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: Setup JAVA_HOME setting | ||
| env: | ||
| GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| run: | | ||
| export ASDF_CONFIG_FILE=${HOME}"/.asdfrc" | ||
| echo "java_macos_integration_enable = yes" > "${ASDF_CONFIG_FILE}" | ||
| . $PWD/asdf/asdf.sh | ||
| asdf plugin add java "$GITHUB_WORKSPACE" | ||
| asdf install java adoptopenjdk-8.0.252+9.1.openj9-0.20.0 | ||
|
There was a problem hiding this comment. After the changes in #140, this (and all subsequent usages of this identifier in this file) should probably be There was a problem hiding this comment. Will see what is needed now to get things to work again properly. Been a long time since I last worked on this... |
||
| asdf global java adoptopenjdk-8.0.252+9.1.openj9-0.20.0 | ||
| echo ". $PWD/asdf/asdf.sh" >> $HOME/.zshrc | ||
| echo ". $HOME/.asdf/plugins/java/set-java-home.zsh" >> $HOME/.zshrc | ||
| mkdir -p $HOME/.config/fish/functions/ | ||
| ln -s $HOME/.asdf/plugins/java/set-java-home.fish $HOME/.config/fish/functions/asdf_update_java_home.fish | ||
| echo "source $PWD/asdf/asdf.fish" >> $HOME/.config/fish/config.fish | ||
| echo "asdf_update_java_home" >> $HOME/.config/fish/config.fish | ||
| - name: Run JAVA_HOME setting test fish | ||
| env: | ||
| GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| run: | | ||
| echo $JAVA_HOME | grep adoptopenjdk-8.0.252+9.1.openj9-0.20.0 | ||
| shell: fish {0} | ||
| - name: Run JAVA_HOME setting test bash | ||
| env: | ||
| GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| run: | | ||
| . $PWD/asdf/asdf.sh | ||
| . set-java-home.bash | ||
| _asdf_java_prompt_command | ||
| echo $JAVA_HOME | grep -q adoptopenjdk-8.0.252+9.1.openj9-0.20.0 | ||
| shell: bash {0} | ||
| - name: Run JAVA_HOME setting test xonsh | ||
| env: | ||
| GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| run: | | ||
| $RAISE_SUBPROC_ERROR = True | ||
| source-bash $PWD/asdf/asdf.sh | ||
| source set-java-home.xsh | ||
| echo $JAVA_HOME | grep -q adoptopenjdk-8.0.252+9.1.openj9-0.20.0 | ||
| shell: xonsh {0} | ||
| - name: Run JAVA_HOME setting test zsh | ||
| env: | ||
| GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| run: | | ||
| source $HOME/.zshrc | ||
| asdf_update_java_home | ||
| echo $JAVA_HOME | grep -q adoptopenjdk-8.0.252+9.1.openj9-0.20.0 | ||
| shell: zsh {0} | ||
| - name: Setup system tool-version test on macOS | ||
| 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}" | ||
| . $PWD/asdf/asdf.sh | ||
| . set-java-home.bash | ||
| asdf install java zulu-16.28.11 | ||
| mkdir system | ||
| cd system | ||
| echo "java system" > .tool-versions | ||
| - name: Run system tool-version test on macOS with fish | ||
| if: matrix.os == 'macOS-latest' | ||
| env: | ||
| GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| run: | | ||
| cd system | ||
| asdf_update_java_home | ||
| echo $JAVA_HOME | grep -q "/Library/Java/JavaVirtualMachines/" | ||
| shell: fish {0} | ||
| - name: Run system tool-version test on macOS with bash | ||
| if: matrix.os == 'macOS-latest' | ||
| env: | ||
| GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| run: | | ||
| . $PWD/asdf/asdf.sh | ||
| . set-java-home.bash | ||
| cd system | ||
| _asdf_java_prompt_command | ||
| echo $JAVA_HOME | grep -q "/Library/Java/JavaVirtualMachines/" | ||
| shell: bash {0} | ||
| - name: Run system tool-version test on macOS with xonsh | ||
| if: matrix.os == 'macOS-latest' | ||
| env: | ||
| GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| run: | | ||
| $RAISE_SUBPROC_ERROR = True | ||
| source-bash $PWD/asdf/asdf.sh | ||
| source set-java-home.xsh | ||
| cd system | ||
| echo $JAVA_HOME | grep -q "/Library/Java/JavaVirtualMachines/" | ||
| shell: xonsh {0} | ||
| - name: Run system tool-version test on macOS with zsh | ||
| if: matrix.os == 'macOS-latest' | ||
| env: | ||
| GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| run: | | ||
| source $HOME/.zshrc | ||
| cd system | ||
| asdf_update_java_home | ||
| echo $JAVA_HOME | grep -q "/Library/Java/JavaVirtualMachines/" | ||
| shell: zsh {0} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| .idea/ | ||
|
There was a problem hiding this comment. Could we remove this file again? There was a problem hiding this comment. I've added this since I'm working from IntelliJ IDEA. This way I prevent my IDEA setup to be checked in, which I think is preferable? There was a problem hiding this comment. I think this should be in your own global |
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@delgurth Could you please either update the
indent_sizein.editorconfigto match the existing code or remove the file altogether, and revert the whitespace related changes in this PR?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'll remove all formatting changes. I've tried to align it, but if I recall correctly the formatting was different in different parts of the codebase.