Skip to content

Commit

Permalink
Remove hacky subprocess call in action.yml (psf#3226)
Browse files Browse the repository at this point in the history
Updates action.yml to use the alternative $GITHUB_ACTION_PATH variable
instead of the original ${{ github.action_path }} which caused issues
with bash on the Windows runners. This removes the need for a Python
subprocess to call the main.py script.
  • Loading branch information
ionite34 authored and hugovk committed Sep 3, 2022
1 parent 4c13d8e commit fb2c63b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 17 deletions.
1 change: 1 addition & 0 deletions AUTHORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ Multiple contributions by:
- [Hugo Barrera](mailto::hugo@barrera.io)
- Hugo van Kemenade
- [Hynek Schlawack](mailto:hs@ox.cx)
- [Ionite](mailto:dev@ionite.io)
- [Ivan Katanić](mailto:ivan.katanic@gmail.com)
- [Jakub Kadlubiec](mailto:jakub.kadlubiec@skyscanner.net)
- [Jakub Warczarek](mailto:jakub.warczarek@gmail.com)
Expand Down
19 changes: 2 additions & 17 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,25 +29,10 @@ runs:
using: composite
steps:
- run: |
# Exists since using github.action_path + path to main script doesn't work because bash
# interprets the backslashes in github.action_path (which are used when the runner OS
# is Windows) destroying the path to the target file.
#
# Also semicolons are necessary because I can't get the newlines to work
entrypoint="import sys;
import subprocess;
from pathlib import Path;
MAIN_SCRIPT = Path(r'${GITHUB_ACTION_PATH}') / 'action' / 'main.py';
proc = subprocess.run([sys.executable, str(MAIN_SCRIPT)]);
sys.exit(proc.returncode)
"
if [ "$RUNNER_OS" == "Windows" ]; then
echo $entrypoint | python
python $GITHUB_ACTION_PATH/action/main.py
else
echo $entrypoint | python3
python3 $GITHUB_ACTION_PATH/action/main.py
fi
env:
# TODO: Remove once https://github.com/actions/runner/issues/665 is fixed.
Expand Down

0 comments on commit fb2c63b

Please sign in to comment.