Skip to content

Commit

Permalink
Removed need for subprocess in action.yml
Browse files Browse the repository at this point in the history
  • Loading branch information
ionite34 committed Aug 15, 2022
1 parent 4ebf14d commit b54370f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 17 deletions.
2 changes: 2 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@
- Vim plugin: prefix messages with `Black: ` so it's clear they come from Black (#3194)
- Docker: changed to a /opt/venv installation + added to PATH to be available to
non-root users (#3202)
- GitHub Action: Updated usage of $GITHUB_ACTION_PATH to remove the nested python
subprocess call for actions/main.py (#3226)

### Output

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 b54370f

Please sign in to comment.