diff --git a/.github/workflows/clean.yml b/.github/workflows/clean.yml index c37b0199..7c48514a 100644 --- a/.github/workflows/clean.yml +++ b/.github/workflows/clean.yml @@ -25,7 +25,6 @@ jobs: LOWER_BRANCH=${{ github.event.pull_request.head.ref }} SLUG_BRANCH=$(echo "$LOWER_BRANCH" | sed -e 's/[^a-zA-Z0-9]/-/g' -e 's/--/-/g') echo "BASE_REF=$SLUG_BRANCH" >> $GITHUB_ENV - fi - name: Delete tag on PR close or merge if: github.event_name == 'pull_request' && github.event.action == 'closed' env: diff --git a/server/src/main/resources/shell_wrapper.py b/server/src/main/resources/shell_wrapper.py index 038367dd..88e3e312 100644 --- a/server/src/main/resources/shell_wrapper.py +++ b/server/src/main/resources/shell_wrapper.py @@ -91,6 +91,7 @@ def __init__(self, globals) -> None: def _error_response(self, error): exc_type, exc_value, exc_tb = sys.exc_info() return { + "content": {"text/plain": str(sys.stdout.getvalue()).rstrip()}, "error": type(error).__name__, "message": str(error), "traceback": traceback.format_exception(exc_type, exc_value, exc_tb), @@ -144,8 +145,8 @@ def main(): log.info("Starting session loop") try: while True: - setup_output() for command in controller.read(): + setup_output() log.debug(f"Processing command {command}") result = handler.exec(command) controller.write(command["id"], result)