From b54370fef59e5deb998690614845fa0083069e85 Mon Sep 17 00:00:00 2001 From: ionite34 Date: Mon, 15 Aug 2022 18:07:01 -0400 Subject: [PATCH] Removed need for subprocess in action.yml --- CHANGES.md | 2 ++ action.yml | 19 ++----------------- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index fb7a2723b67..f7204d0cfdd 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -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 diff --git a/action.yml b/action.yml index dbd8ef69ec2..cfa6ef9fb7e 100644 --- a/action.yml +++ b/action.yml @@ -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.