diff --git a/.gitignore b/.gitignore index 7929f62..4410b7e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ .task/* .venv +venv/ publish.sh main.sh __pycache__ diff --git a/Dockerfile b/Dockerfile index dbe50f7..3ab9cc3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM python:3-slim AS builder -ENV MARK="9.9.0" +ENV MARK="9.12.0" ADD . /app WORKDIR /app diff --git a/mark2confluence/main.py b/mark2confluence/main.py index 3daffaf..f9aa3e4 100755 --- a/mark2confluence/main.py +++ b/mark2confluence/main.py @@ -89,7 +89,9 @@ def publish(path: str)-> tuple: proc = subprocess.Popen(args, shell=False, stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd = os.path.dirname(path)) try: - _, errs = proc.communicate(timeout=120) + out, errs = proc.communicate(timeout=120) + if cfg.inputs.ACTION == ACTION_VERIFY: + logger.info(f"Verify: mark compiled html: {out}") except subprocess.TimeoutExpired: proc.kill() _, errs = proc.communicate()