From 6f4d654ec18e619e5c4c1ea43864eaf6711e598a Mon Sep 17 00:00:00 2001 From: Oleksandr Bordun Date: Sun, 21 Apr 2019 23:42:36 +0200 Subject: [PATCH 1/6] Adding PR tests --- .github/main.workflow | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/.github/main.workflow b/.github/main.workflow index 66e555e..f5d18c0 100644 --- a/.github/main.workflow +++ b/.github/main.workflow @@ -1,6 +1,6 @@ workflow "Build and Publish" { - on = "push" resolves = "Docker Publish" + on = "push" } action "Shell Lint" { @@ -47,3 +47,23 @@ action "Docker Publish" { uses = "actions/docker/cli@master" args = "push borales/yarn" } + +workflow "Pull Request" { + on = "pull_request" + resolves = ["Docker Lint [PR]", "Shell Lint [PR]", "Test [PR]"] +} + +action "Docker Lint [PR]" { + uses = "docker://replicated/dockerfilelint" + args = "[\"Dockerfile\"]" +} + +action "Shell Lint [PR]" { + uses = "actions/bin/shellcheck@master" + args = "entrypoint.sh" +} + +action "Test [PR]" { + uses = "actions/bin/bats@master" + args = "test/*.bats" +} From 2f417a09c0ead0483e98fc8915b5501ef359ce3e Mon Sep 17 00:00:00 2001 From: Oleksandr Bordun Date: Mon, 22 Apr 2019 00:28:20 +0200 Subject: [PATCH 2/6] Fixing Docker Lint --- .github/main.workflow | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/main.workflow b/.github/main.workflow index f5d18c0..81da93d 100644 --- a/.github/main.workflow +++ b/.github/main.workflow @@ -55,7 +55,7 @@ workflow "Pull Request" { action "Docker Lint [PR]" { uses = "docker://replicated/dockerfilelint" - args = "[\"Dockerfile\"]" + args = "Dockerfile" } action "Shell Lint [PR]" { From 05eb7c3a78e134f28f797480c73ef8184779a2d5 Mon Sep 17 00:00:00 2001 From: Oleksandr Bordun Date: Mon, 22 Apr 2019 01:00:10 +0200 Subject: [PATCH 3/6] Update main.workflow --- .github/main.workflow | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/main.workflow b/.github/main.workflow index 81da93d..0144cd7 100644 --- a/.github/main.workflow +++ b/.github/main.workflow @@ -55,7 +55,7 @@ workflow "Pull Request" { action "Docker Lint [PR]" { uses = "docker://replicated/dockerfilelint" - args = "Dockerfile" + args = "[\"./Dockerfile\"]" } action "Shell Lint [PR]" { From 02dfec60b123c8b44af74686e3df5890e4b29aa4 Mon Sep 17 00:00:00 2001 From: Oleksandr Bordun Date: Mon, 22 Apr 2019 11:35:55 +0200 Subject: [PATCH 4/6] Updating main workflow --- .github/main.workflow | 57 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 52 insertions(+), 5 deletions(-) diff --git a/.github/main.workflow b/.github/main.workflow index 0144cd7..33655f5 100644 --- a/.github/main.workflow +++ b/.github/main.workflow @@ -1,8 +1,3 @@ -workflow "Build and Publish" { - resolves = "Docker Publish" - on = "push" -} - action "Shell Lint" { uses = "actions/bin/shellcheck@master" args = "entrypoint.sh" @@ -67,3 +62,55 @@ action "Test [PR]" { uses = "actions/bin/bats@master" args = "test/*.bats" } + +workflow "Build and Publish" { + resolves = ["Test [N]", "Docker Login [N]", "Docker Publish [N]", "Docker Lint [N]"] + on = "push" +} + +action "Master Branch" { + uses = "actions/bin/filter@master" + args = "branch master" +} + +action "Docker Lint [N]" { + uses = "docker://replicated/dockerfilelint" + needs = ["Master Branch"] + args = "[\"Dockerfile\"]" +} + +action "Shell Lint [N]" { + uses = "actions/bin/shellcheck@master" + needs = ["Master Branch"] + args = "entrypoint.sh" +} + +action "Test [N]" { + uses = "actions/bin/bats@master" + needs = ["Master Branch"] + args = "test/*.bats" +} + +action "Build [N]" { + uses = "actions/docker/cli@master" + needs = ["Shell Lint [N]", "Test [N]", "Docker Lint [N]"] + args = "build -t yarn ." +} + +action "Docker Tag [N]" { + uses = "actions/docker/tag@master" + needs = ["Build [N]"] + args = "yarn borales/yarn --no-latest" +} + +action "Docker Login [N]" { + uses = "actions/docker/login@master" + needs = ["Build [N]"] + secrets = ["DOCKER_PASSWORD", "DOCKER_USERNAME"] +} + +action "Docker Publish [N]" { + uses = "actions/docker/cli@master" + needs = ["Docker Tag [N]", "Docker Login [N]"] + args = "push borales/yarn" +} From 7ba8158c630e9aee98e37ba9e3f711d6a2ef7fe4 Mon Sep 17 00:00:00 2001 From: Oleksandr Bordun Date: Mon, 22 Apr 2019 11:44:37 +0200 Subject: [PATCH 5/6] Update main.workflow --- .github/main.workflow | 83 +++++++++++++------------------------------ 1 file changed, 25 insertions(+), 58 deletions(-) diff --git a/.github/main.workflow b/.github/main.workflow index 33655f5..679ef81 100644 --- a/.github/main.workflow +++ b/.github/main.workflow @@ -1,48 +1,3 @@ -action "Shell Lint" { - uses = "actions/bin/shellcheck@master" - args = "entrypoint.sh" -} - -action "Test" { - uses = "actions/bin/bats@master" - args = "test/*.bats" -} - -action "Docker Lint" { - uses = "docker://replicated/dockerfilelint" - args = ["Dockerfile"] -} - -action "Build" { - needs = ["Shell Lint", "Test", "Docker Lint"] - uses = "actions/docker/cli@master" - args = "build -t yarn ." -} - -action "Docker Tag" { - needs = ["Build"] - uses = "actions/docker/tag@master" - args = "yarn borales/yarn --no-latest" -} - -action "Publish Filter" { - needs = ["Build"] - uses = "actions/bin/filter@master" - args = "branch master" -} - -action "Docker Login" { - needs = ["Publish Filter"] - uses = "actions/docker/login@master" - secrets = ["DOCKER_USERNAME", "DOCKER_PASSWORD"] -} - -action "Docker Publish" { - needs = ["Docker Tag", "Docker Login"] - uses = "actions/docker/cli@master" - args = "push borales/yarn" -} - workflow "Pull Request" { on = "pull_request" resolves = ["Docker Lint [PR]", "Shell Lint [PR]", "Test [PR]"] @@ -64,7 +19,12 @@ action "Test [PR]" { } workflow "Build and Publish" { - resolves = ["Test [N]", "Docker Login [N]", "Docker Publish [N]", "Docker Lint [N]"] + resolves = [ + "Docker Lint", + "Test", + "Docker Login", + "Docker Publish", + ] on = "push" } @@ -73,44 +33,51 @@ action "Master Branch" { args = "branch master" } -action "Docker Lint [N]" { +action "Docker Lint" { uses = "docker://replicated/dockerfilelint" needs = ["Master Branch"] - args = "[\"Dockerfile\"]" + args = "[\"./Dockerfile\"]" } -action "Shell Lint [N]" { +action "Shell Lint" { uses = "actions/bin/shellcheck@master" needs = ["Master Branch"] args = "entrypoint.sh" } -action "Test [N]" { +action "Test" { uses = "actions/bin/bats@master" needs = ["Master Branch"] args = "test/*.bats" } -action "Build [N]" { +action "Build" { uses = "actions/docker/cli@master" - needs = ["Shell Lint [N]", "Test [N]", "Docker Lint [N]"] + needs = [ + "Docker Lint", + "Test", + "Shell Lint", + ] args = "build -t yarn ." } -action "Docker Tag [N]" { +action "Docker Tag" { uses = "actions/docker/tag@master" - needs = ["Build [N]"] args = "yarn borales/yarn --no-latest" + needs = ["Build"] } -action "Docker Login [N]" { +action "Docker Login" { uses = "actions/docker/login@master" - needs = ["Build [N]"] secrets = ["DOCKER_PASSWORD", "DOCKER_USERNAME"] + needs = ["Build"] } -action "Docker Publish [N]" { +action "Docker Publish" { uses = "actions/docker/cli@master" - needs = ["Docker Tag [N]", "Docker Login [N]"] + needs = [ + "Docker Login", + "Docker Tag", + ] args = "push borales/yarn" } From 433d223b19f78098e3a71a7484309d02f3b77488 Mon Sep 17 00:00:00 2001 From: Oleksandr Bordun Date: Mon, 22 Apr 2019 12:17:11 +0200 Subject: [PATCH 6/6] Fixing Dockerfilelint action --- .github/main.workflow | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/main.workflow b/.github/main.workflow index 679ef81..498d701 100644 --- a/.github/main.workflow +++ b/.github/main.workflow @@ -5,7 +5,7 @@ workflow "Pull Request" { action "Docker Lint [PR]" { uses = "docker://replicated/dockerfilelint" - args = "[\"./Dockerfile\"]" + args = "Dockerfile" } action "Shell Lint [PR]" { @@ -36,7 +36,7 @@ action "Master Branch" { action "Docker Lint" { uses = "docker://replicated/dockerfilelint" needs = ["Master Branch"] - args = "[\"./Dockerfile\"]" + args = "Dockerfile" } action "Shell Lint" {