diff --git a/.github/main.workflow b/.github/main.workflow index 0604c6c..668ba22 100644 --- a/.github/main.workflow +++ b/.github/main.workflow @@ -8,12 +8,18 @@ action "Shell Lint" { args = "entrypoint.sh" } -action "Build" { +action "Build Docker" { needs = ["Shell Lint"] uses = "actions/docker/cli@master" args = "build -t npm ." } +action "Build" { + needs = ["Build Docker"] + uses = "actions/npm@master" + args = "install" +} + action "Docker Tag" { needs = ["Build"] uses = "actions/docker/tag@master" diff --git a/entrypoint.sh b/entrypoint.sh index 4f06db7..a486557 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -12,4 +12,9 @@ if [ -n "$NPM_AUTH_TOKEN" ]; then chmod 0600 "$NPM_CONFIG_USERCONFIG" fi -sh -c "node /merge-release-run.js $*" +if [ $GITHUB_REPOSITORY == "mikeal/merge-release" ] +then + sh -c "node /merge-release-run.js $*" +else + sh -c "npx merge-release $*" +fi