Skip to content
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
33 changes: 16 additions & 17 deletions .github/workflows/test-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ run-name: "Run Jython tests"

on:
push:
pull_request:
workflow_dispatch:

concurrency:
Expand All @@ -22,16 +21,16 @@ jobs:
- windows-latest
- macos-latest
jython_version:
- "2.7.3"
- "2.7.2"
- "2.7.1"
- "2.7.0"
- "2.5.3"
- "2.5.2"
- "2.5.1"
- "2.5.0"
- "2.2.1"
- "2.2"
# - "2.7.3"
# - "2.7.2"
# - "2.7.1"
# - "2.7.0"
# - "2.5.3"
# - "2.5.2"
# - "2.5.1"
# - "2.5.0"
# - "2.2.1"
# - "2.2"
- "2.1"
- "2.0"

Expand Down Expand Up @@ -65,30 +64,30 @@ jobs:
shell: bash
run: |
printf "\033[0;33mEnvironment variables:\033[0m\n";
env
env | sed 's/^/ | /'

printf -- "\033[0;96m--------------------------------------------------\033[0m\n\n";
printf "\033[0;33mGithub PATH (GITHUB_PATH='%s'):\033[0m\n" "$GITHUB_PATH";
cat "$GITHUB_PATH";
cat "$GITHUB_PATH" | sed 's/^/ | /'

printf -- "\033[0;96m--------------------------------------------------\033[0m\n\n";
printf "\033[0;33mInstallation folder content:\033[0m\n";
ls -la ~/jython/;
ls -la ~/jython/ | sed 's/^/ | /'

printf -- "\033[0;96m--------------------------------------------------\033[0m\n\n";
printf "\033[0;33mBinary files:\033[0m\n";
ls -la ~/.local/bin/;
ls -la ~/.local/bin/ | sed 's/^/ | /'

printf -- "\033[0;96m--------------------------------------------------\033[0m\n\n";
printf "\033[0;33mBash script ('jython'):\033[0m\n";
if [ -f ~/.local/bin/jython ]; then
cat ~/.local/bin/jython;
cat ~/.local/bin/jython | sed 's/^/ | /'
fi

printf -- "\033[0;96m--------------------------------------------------\033[0m\n\n";
printf "\033[0;33mBatch script ('jython.bat'):\033[0m\n";
if [ -f ~/.local/bin/jython.bat ]; then
cat ~/.local/bin/jython.bat;
cat ~/.local/bin/jython.bat | sed 's/^/ | /'
fi

- name: Run Jython (Bash)
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-path.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ run-name: "Installation path"

on:
push:
pull_request:

jobs:
default_path:
Expand Down
4 changes: 2 additions & 2 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ runs:
# # Created on XXX by @user.name@
#
# "@jvm@" -Dpython.home="@location._top_@" -classpath "@location._top_@/jython.jar:$CLASSPATH" "@classname@" "$@"
jython_cmd="java -verbose -Dpython.path=${installation_path}/Lib -Dpython.home=${installation_path} -cp ${installation_path}/jython.jar org.python.util.jython \"\$@\""
jython_cmd="java -cp ${installation_path}/jython.jar org.python.util.jython \"\$@\""
;;

jar)
Expand All @@ -170,7 +170,7 @@ runs:
run: |
$installation_path = Convert-Path "${{ inputs.installation-path }}"
if ("${{ steps.find_installer.outputs.file_type }}" -eq "class") {
$jython_cmd = "java -Dpython.path=${installation_path}/Lib -Dpython.home=$installation_path -cp $installation_path\jython.jar org.python.util.jython %*"
$jython_cmd = "java -cp ${installation_path}\jython.jar org.python.util.jython %*"
} else {
$jython_cmd = "java -jar $installation_path\jython.jar %*"
}
Expand Down