dycw-actions 0.8.4__py3-none-any.whl → 0.8.5__py3-none-any.whl

actions/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.8.4"
+__version__ = "0.8.5"

actions/register_gitea_runner/lib.py

@@ -7,7 +7,7 @@ from typing import TYPE_CHECKING
 
 from requests import get
 from utilities.atomicwrites import writer
-from utilities.subprocess import chmod, run, ssh
+from utilities.subprocess import chmod, ssh
 from utilities.text import strip_and_dedent
 
 from actions import __version__
@@ -19,6 +19,7 @@ from actions.register_gitea_runner.constants import (
     URL_WAIT_FOR_IT,
 )
 from actions.register_gitea_runner.settings import SETTINGS
+from actions.utilities import logged_run
 
 if TYPE_CHECKING:
     from utilities.types import PathLike
@@ -71,6 +72,7 @@ def register_gitea_runner(
         *_docker_exec_generate(user=gitea_container_user, name=gitea_container_name),
         return_=True,
     )
+    LOGGER.info("Got token %r", token)
     _start_runner(
         token,
         runner_certificate=runner_certificate,
@@ -95,10 +97,9 @@ def register_against_local(
 ) -> None:
     """Register against a local instance of Gitea."""
     LOGGER.info("Registering against %s:%d...", gitea_host, gitea_port)
-    token = run(
+    token = logged_run(
         *_docker_exec_generate(user=gitea_container_user, name=gitea_container_name),
         return_=True,
-        logger=LOGGER,
     )
     _start_runner(
         token,
@@ -236,10 +237,8 @@ def _start_runner(
     _write_config(token, capacity=runner_capacity, certificate=runner_certificate)
     _write_entrypoint(host=gitea_host, port=gitea_port)
     _write_wait_for_it()
-    run(
-        *_docker_stop_runner_args(name=runner_container_name), print=True, logger=LOGGER
-    )
-    run(
+    logged_run(*_docker_stop_runner_args(name=runner_container_name), print=True)
+    logged_run(
         *_docker_run_act_runner_args(
             token,
             host=gitea_host,
@@ -249,7 +248,6 @@ def _start_runner(
             container_name=runner_container_name,
         ),
         print=True,
-        logger=LOGGER,
     )
 
 

{dycw_actions-0.8.4.dist-info → dycw_actions-0.8.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: dycw-actions
-Version: 0.8.4
+Version: 0.8.5
 Summary: Library of actions
 Requires-Dist: click>=8.3.1,<9
 Requires-Dist: dycw-utilities>=0.179.0,<1

{dycw_actions-0.8.4.dist-info → dycw_actions-0.8.5.dist-info}/RECORD

@@ -1,4 +1,4 @@
-actions/__init__.py,sha256=H8mH4w15RqfIw35Zak8l6adkEaCxYcUWrU66Ygj9eb0,58
+actions/__init__.py,sha256=OlKKXmurpRa7hpnMwsqC-3AVjanBWghNU3iQC6jDLXg,58
 actions/clean_dir/__init__.py,sha256=U4S_2y3zgLZVfMenHRaJFBW8yqh2mUBuI291LGQVOJ8,35
 actions/clean_dir/cli.py,sha256=OrFA2nEN2LyGF22mhTNEBr7KSuKgX54sGy9RyE73qUc,569
 actions/clean_dir/constants.py,sha256=aDNaYtemEv3lcMXo96Oh4pw_HASMby1GZC1D_gbjPAc,167
@@ -55,7 +55,7 @@ actions/register_gitea_runner/cli.py,sha256=70RUyzKCZHxyDRMFwCAwDC0LDsUZxBi2T6ct
 actions/register_gitea_runner/configs/config.yml,sha256=0kpaqAjMRDqdSxkSK8ydOk2IsrlkB4cUkYmbkHAurrg,5683
 actions/register_gitea_runner/configs/entrypoint.sh,sha256=IN40hAu8ufyyFWPIgsX_hWp0ZZZ0c36czCaqmECjBrw,476
 actions/register_gitea_runner/constants.py,sha256=wX1f5qvhIXngBVWbIQRoIaXIdPaUByvG8HS8P0WcCGM,694
-actions/register_gitea_runner/lib.py,sha256=V_K6UHmZOD9V-DF6ZNA2QakNyuyuyjgJZ6AJQFf37lQ,8832
+actions/register_gitea_runner/lib.py,sha256=ouc5XGfFRnAQNzU238U0_oVTdmdGEIrOW8lggqXsogM,8853
 actions/register_gitea_runner/settings.py,sha256=0UQm8M3qDiBE3jiE333M4FdLjikNAzpc9gk_VlzI0s8,1149
 actions/run_hooks/__init__.py,sha256=U4S_2y3zgLZVfMenHRaJFBW8yqh2mUBuI291LGQVOJ8,35
 actions/run_hooks/cli.py,sha256=xKBw6iIlHpUlHl6-QWQLSL6KKVjnsihBeJ7h58Rl8P4,616
@@ -76,7 +76,7 @@ actions/tag_commit/lib.py,sha256=rq1SqAkNp98cPsNOsFY4F1D6nNi7N3wqVbFPno8lsuI,184
 actions/tag_commit/settings.py,sha256=TOeKG_GODP--2lBSyGzH_M32jDIfh4vk_Ts06R3_ak4,629
 actions/types.py,sha256=1P3oAnYxyKgAfv8986jZ6whwdHV0qLHoX0oR8brviQk,586
 actions/utilities.py,sha256=VpFLBiAezgSRlm9dvnyPyQohreaV2Lv7cJ9HAxqZ4WI,4086
-dycw_actions-0.8.4.dist-info/WHEEL,sha256=KSLUh82mDPEPk0Bx0ScXlWL64bc8KmzIPNcpQZFV-6E,79
-dycw_actions-0.8.4.dist-info/entry_points.txt,sha256=2Uu7wAZOm0mmcsGBEsGB370HAWgVWECRFJ9rKgfC3-I,46
-dycw_actions-0.8.4.dist-info/METADATA,sha256=GyCgKEL03OjKWo5XN-TLYvLBqNfsih61YIFlwZwvQW4,654
-dycw_actions-0.8.4.dist-info/RECORD,,
+dycw_actions-0.8.5.dist-info/WHEEL,sha256=KSLUh82mDPEPk0Bx0ScXlWL64bc8KmzIPNcpQZFV-6E,79
+dycw_actions-0.8.5.dist-info/entry_points.txt,sha256=2Uu7wAZOm0mmcsGBEsGB370HAWgVWECRFJ9rKgfC3-I,46
+dycw_actions-0.8.5.dist-info/METADATA,sha256=_wo_GxdFbHJzLCgdaBRLKBe-TwFpIuQZ9e0MyWHptUY,654
+dycw_actions-0.8.5.dist-info/RECORD,,