combine push and PR workflows

This commit is contained in:
Jeff Billimek 2019-05-26 17:46:29 -04:00 committed by GitHub
parent 9159b65fbf
commit 5a2889e4b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

17
.github/main.workflow vendored
View File

@ -1,7 +1,7 @@
workflow "Lint & Publish Helm chart" { workflow "Lint & Publish Helm chart" {
resolves = [ resolves = [
"Package Helm Chart(s)", "Package Helm Chart(s)",
"Filter for non-merged PRs", "Pull Request Linting",
] ]
on = "push" on = "push"
} }
@ -10,20 +10,14 @@ action "Package Helm Chart(s)" {
uses = "billimek/gh-actions/helm-gh-pages@master" uses = "billimek/gh-actions/helm-gh-pages@master"
args = "https://billimek.com/billimek-charts/" args = "https://billimek.com/billimek-charts/"
secrets = ["GITHUB_TOKEN"] secrets = ["GITHUB_TOKEN"]
needs = ["Filter for non-merged PRs"] needs = ["Filter for master"]
}
workflow "Pull Request" {
on = "pull_request"
resolves = [
"Pull Request Linting",
]
} }
action "Pull Request Linting" { action "Pull Request Linting" {
uses = "billimek/gh-actions/helm-gh-pages@master" uses = "billimek/gh-actions/helm-gh-pages@master"
args = "https://billimek.com/billimek-charts/" args = "https://billimek.com/billimek-charts/"
secrets = ["GITHUB_TOKEN"] secrets = ["GITHUB_TOKEN"]
needs = ["Filter for not master"]
} }
action "Filter for master" { action "Filter for master" {
@ -32,9 +26,8 @@ action "Filter for master" {
secrets = ["GITHUB_TOKEN"] secrets = ["GITHUB_TOKEN"]
} }
action "Filter for non-merged PRs" { action "Filter for not master" {
uses = "actions/bin/filter@master" uses = "actions/bin/filter@master"
needs = ["Filter for master"] args = "not branch master"
args = "not merged true"
secrets = ["GITHUB_TOKEN"] secrets = ["GITHUB_TOKEN"]
} }