Unify commands and centralize logging (#703)

Co-authored-by: Helio Machado <0x2b3bfa0+git@googlemail.com> Co-authored-by: Casper da Costa-Luis <casper.dcl@physics.org>
iterative · Sep 9, 2021 · 60ff630 · 60ff630 · github-actions · Sep 9, 2021
1 parent 15f26e5
commit 60ff630
Show file tree

Hide file tree

Showing 31 changed files with 1,109 additions and 820 deletions.
diff --git a/.github/workflows/gitlab.yml b/.github/workflows/gitlab.yml
@@ -64,7 +64,7 @@ jobs:
         run: npm ci
       - name: Run cml-send-comment
         run: |
-          node bin/cml-send-comment.js \
+          node bin/cml.js send-comment \
           --token=${{ github.token }} \
           --repo=http://localhost:8000/gitlab/root/test \
           --commit-sha=${{ steps.commit.outputs.hash }} \

diff --git a/Dockerfile b/Dockerfile
@@ -101,4 +101,9 @@ WORKDIR ${RUNNER_PATH}
 
 # COMMAND
 ENV IN_DOCKER=1
-CMD ["cml-runner"]
+# Smart entrypoint understands commands like `bash` or `/bin/sh` but defaults to `cml`;
+# also works for GitLab CI/CD
+# https://gitlab.com/gitlab-org/gitlab-runner/-/blob/4c42e96/shells/bash.go#L18-37
+# https://gitlab.com/gitlab-org/gitlab-runner/-/blob/4c42e96/shells/bash.go#L288
+ENTRYPOINT ["/bin/bash", "-c", "which -- \"$0\" &>/dev/null && exec \"$0\" \"$@\" || exec cml \"$0\" \"$@\""]
+CMD ["--help"]
diff --git a/bin/cml-pr.js b/bin/cml-pr.js
diff --git a/bin/cml-pr.test.js b/bin/cml-pr.test.js
diff --git a/bin/cml-publish.js b/bin/cml-publish.js
diff --git a/bin/cml-publish.test.js b/bin/cml-publish.test.js
diff --git a/bin/cml-send-comment.js b/bin/cml-send-comment.js