Skip to content

Commit

Permalink
remove setup-go from ytt templates
Browse files Browse the repository at this point in the history
  • Loading branch information
jbrunton committed Jun 27, 2021
1 parent 7a36b0b commit 9c7a165
Show file tree
Hide file tree
Showing 10 changed files with 48 additions and 40 deletions.
1 change: 1 addition & 0 deletions .gflows/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Config file for GFlows.
# See https://github.com/jbrunton/gflows/wiki/Configuration for options.
githubDir: .github
templates:
engine: ytt
defaults:
Expand Down
13 changes: 10 additions & 3 deletions .gflows/examples/default-ytt/libs/steps.lib.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
#@ def setup_go():
uses: actions/setup-go@v2
#@ def setup_gflows():
uses: jbrunton/setup-gflows@v1
with:
go-version: "^1.14.4"
token: ${{ secrets.GITHUB_TOKEN }}
#@ end
---
#@ def check_workflows():
name: check workflows
env:
GFLOWS_CONFIG: .gflows/examples/default-ytt/config.yml
run: gflows check
#@ end
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#@ load("workflows.lib.yml", "pull_request_defaults")
#@ load("steps.lib.yml", "setup_go")
#@ load("steps.lib.yml", "setup_gflows", "check_workflows")

name: gflows

Expand All @@ -11,11 +11,5 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- #@ setup_go()
- uses: jbrunton/setup-gflows@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
- name: validate workflows
env:
GFLOWS_CONFIG: .gflows/examples/default-ytt/config.yml
run: gflows check
- #@ setup_gflows()
- #@ check_workflows()
13 changes: 13 additions & 0 deletions .gflows/workflows/common/steps.lib.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
#@ def setup_gflows():
uses: jbrunton/setup-gflows@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
#@ end
---
#@ def check_workflows():
name: check workflows
env:
GFLOWS_CONFIG: .gflows/config.yml
run: gflows check
#@ end
---
#@ def setup_go():
uses: actions/setup-go@v2
with:
Expand Down
10 changes: 3 additions & 7 deletions .gflows/workflows/gflows/gflows.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#@ load("workflows.lib.yml", "pull_request_defaults")
#@ load("steps.lib.yml", "setup_go")
#@ load("steps.lib.yml", "setup_gflows", "check_workflows")

name: gflows

Expand All @@ -11,9 +11,5 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- #@ setup_go()
- uses: jbrunton/setup-gflows@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
- name: validate workflows
run: gflows check
- #@ setup_gflows()
- #@ check_workflows()
5 changes: 1 addition & 4 deletions .github/workflows/ex-default-ytt-gflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: ^1.14.4
- uses: jbrunton/setup-gflows@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
- name: validate workflows
- name: check workflows
env:
GFLOWS_CONFIG: .gflows/examples/default-ytt/config.yml
run: gflows check
7 changes: 3 additions & 4 deletions .github/workflows/gflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: ^1.14.4
- uses: jbrunton/setup-gflows@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
- name: validate workflows
- name: check workflows
env:
GFLOWS_CONFIG: .gflows/config.yml
run: gflows check
13 changes: 10 additions & 3 deletions static/content/ytt/libs/steps.lib.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
#@ def setup_go():
uses: actions/setup-go@v2
#@ def setup_gflows():
uses: jbrunton/setup-gflows@v1
with:
go-version: "^1.14.4"
token: ${{ secrets.GITHUB_TOKEN }}
#@ end
---
#@ def check_workflows():
name: check workflows
env:
GFLOWS_CONFIG: $CONFIG_PATH
run: gflows check
#@ end
12 changes: 3 additions & 9 deletions static/content/ytt/workflows/gflows/gflows.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#@ load("workflows.lib.yml", "pull_request_defaults")
#@ load("steps.lib.yml", "setup_go")
#@ load("steps.lib.yml", "setup_gflows", "check_workflows")

name: gflows

Expand All @@ -11,11 +11,5 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- #@ setup_go()
- uses: jbrunton/setup-gflows@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
- name: validate workflows
env:
GFLOWS_CONFIG: $CONFIG_PATH
run: gflows check
- #@ setup_gflows()
- #@ check_workflows()
2 changes: 1 addition & 1 deletion static/statik/statik.go

Large diffs are not rendered by default.

0 comments on commit 9c7a165

Please sign in to comment.