fix: fix merging issues and update defaults documentation

Signed-off-by: Tim Yarkov <[email protected]>
oracle · Sep 8, 2023 · 49ee1ef · 49ee1ef
1 parent 1318924
commit 49ee1ef
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/macaron/config/defaults.ini b/src/macaron/config/defaults.ini
@@ -318,6 +318,7 @@ deploy_arg =
 github_actions =
     docker/build-push-action
 
+# This is the spec for trusted NPM build tool usages.
 [builder.npm]
 entry_conf =
     .npmrc
@@ -337,6 +338,7 @@ deploy_arg =
 github_actions =
     JS-DevTools/npm-publish
 
+# This is the spec for trusted Yarn build tool usages.
 [builder.yarn]
 entry_conf =
     .yarnrc
@@ -351,6 +353,7 @@ build_arg =
 deploy_arg =
     publish
 
+# This is the spec for trusted Go build tool usages.
 [builder.go]
 entry_conf =
 build_configs =

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -169,8 +169,9 @@ def docker_tool(setup_test) -> Docker:  # type: ignore # pylint: disable=unused-
     docker = Docker()
     docker.load_defaults()
     return docker
-
-
+
+
+@pytest.fixture(autouse=True)
 def npm_tool(setup_test) -> NPM:  # type: ignore # pylint: disable=unused-argument
     """Create a NPM tool instance.