Skip to content

Commit

Permalink
ci: make runner input flag (#2071)
Browse files Browse the repository at this point in the history
  • Loading branch information
masseelch committed Sep 12, 2023
1 parent 1d3fbc7 commit ade1fef
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 11 deletions.
2 changes: 1 addition & 1 deletion internal/ci/ci_dialect.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
jobs:
{{- range $.Jobs }}
integration-{{ .Version }}:
runs-on: ubuntu-latest
runs-on: {{ $.Runner }}
{{ if .Image }}services:
{{ .Version }}:
image: {{ .Image }}
Expand Down
10 changes: 5 additions & 5 deletions internal/ci/ci_go.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:

jobs:
lint:
runs-on: ubuntu-latest
runs-on: {{ $.Runner }}
steps:
- uses: actions/setup-go@v4
with:
Expand All @@ -26,7 +26,7 @@ jobs:
args: --verbose

generate-cmp:
runs-on: ubuntu-latest
runs-on: {{ $.Runner }}
steps:
- uses: actions/checkout@v2.4.0
- uses: actions/setup-go@v4
Expand All @@ -48,7 +48,7 @@ jobs:
exit 1
fi
unit:
runs-on: ubuntu-latest
runs-on: {{ $.Runner }}
strategy:
matrix:
go: [ '1.20', '1.21' ]
Expand All @@ -65,7 +65,7 @@ jobs:
working-directory: schemahcl

cli:
runs-on: ubuntu-latest
runs-on: {{ $.Runner }}
steps:
- uses: actions/checkout@v2
- uses: actions/setup-go@v4
Expand All @@ -76,7 +76,7 @@ jobs:
working-directory: cmd/atlas

integration:
runs-on: ubuntu-latest
runs-on: {{ $.Runner }}
steps:
- uses: actions/checkout@v2.3.4
- uses: actions/setup-go@v4
Expand Down
2 changes: 1 addition & 1 deletion internal/ci/ci_revisions.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
- 'cmd/atlas/internal/migrate/ent/**'
jobs:
revisions:
runs-on: ubuntu-latest
runs-on: {{ $.Runner }}
steps:
- uses: actions/checkout@v2.3.4
with:
Expand Down
9 changes: 5 additions & 4 deletions internal/ci/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -165,17 +165,18 @@ var (
)

func main() {
var flavor, tags, suffix string
var flavor, tags, suffix, runner string
flag.StringVar(&flavor, "flavor", "", "")
flag.StringVar(&tags, "tags", "", "")
flag.StringVar(&suffix, "suffix", "", "")
flag.StringVar(&runner, "runner", "ubuntu-latest", "")
flag.Parse()
for _, n := range []string{"dialect", "go", "revisions"} {
var buf bytes.Buffer
if err := tpl.ExecuteTemplate(&buf, fmt.Sprintf("ci_%s.tmpl", n), struct {
Jobs []Job
Flavor, Tags string
}{jobs, flavor, tags}); err != nil {
Jobs []Job
Flavor, Tags, Runner string
}{jobs, flavor, tags, runner}); err != nil {
log.Fatalln(err)
}
err := os.WriteFile(filepath.Clean(fmt.Sprintf("../../.github/workflows/ci-%s_%s.yaml", n, suffix)), buf.Bytes(), 0600)
Expand Down

0 comments on commit ade1fef

Please sign in to comment.