feat: allow fogg ci to be configured with runners

chanzuckerberg · May 11, 2023 · 145dfe6 · 145dfe6
1 parent 954f930
commit 145dfe6
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 5 deletions.
diff --git a/config/v2/config.go b/config/v2/config.go
@@ -108,7 +108,8 @@ type CircleCI struct {
 type GitHubActionsCI struct {
 	CommonCI `yaml:",inline"`
 
-	SSHKeySecrets []string `yaml:"ssh_key_secrets"`
+	SSHKeySecrets []string  `yaml:"ssh_key_secrets"`
+	RunsOn        *[]string `yaml:"runs_on,omitempty"`
 }
 
 type Env struct {

diff --git a/plan/ci.go b/plan/ci.go
@@ -31,6 +31,7 @@ type CircleCIConfig struct {
 type GitHubActionsCIConfig struct {
 	CIConfig
 	SSHKeySecrets []string
+	RunsOn        []string
 }
 
 type TravisCIConfig struct {
@@ -335,15 +336,25 @@ func (p *Plan) buildGitHubActionsConfig(c *v2.Config, foggVersion string) GitHub
 		}
 	}
 
-	var sshKeySecrets []string
+	var (
+		sshKeySecrets []string
+		runsOn        []string
+	)
 
 	if c.Defaults.Tools != nil && c.Defaults.Tools.GitHubActionsCI != nil {
 		sshKeySecrets = c.Defaults.Tools.GitHubActionsCI.SSHKeySecrets
 	}
 
+	if c.Defaults.Tools != nil &&
+		c.Defaults.Tools.GitHubActionsCI != nil &&
+		c.Defaults.Tools.GitHubActionsCI.RunsOn != nil {
+		runsOn = *c.Defaults.Tools.GitHubActionsCI.RunsOn
+	}
+
 	ciConfig = ciConfig.populateBuckets(numBuckets)
 	return GitHubActionsCIConfig{
 		CIConfig:      *ciConfig,
 		SSHKeySecrets: sshKeySecrets,
+		RunsOn:        runsOn,
 	}
 }
diff --git a/templates/templates/.github/workflows/fogg_ci.yml.tmpl b/templates/templates/.github/workflows/fogg_ci.yml.tmpl
@@ -11,7 +11,14 @@ concurrency:
 
 jobs:
   fogg-apply:
+    {{ if (eq (len $githubActionsCI.RunsOn) 0) -}}
     runs-on: ubuntu-latest
+    {{ else -}}
+    runs-on: [{{ range $index, $element := $githubActionsCI.RunsOn -}}
+        {{if $index}},{{end -}}
+        {{$element -}}
+    {{end -}}]
+    {{ end -}}
     steps:
       - name: Generate token
         id: generate_token
@@ -46,7 +53,14 @@ jobs:
           message: |
             commit from fogg_ci -- ran fogg apply and pushed
   find-changed-dirs:
+    {{ if (eq (len $githubActionsCI.RunsOn) 0) -}}
     runs-on: ubuntu-latest
+    {{ else -}}
+    runs-on: [{{ range $index, $element := $githubActionsCI.RunsOn -}}
+        {{if $index}},{{end -}}
+        {{$element -}}
+    {{end -}}]
+    {{ end -}}
     outputs:
       allChanges: {{`${{ steps.changedDirs.outputs.allChanges }}`}}
     steps:
@@ -76,7 +90,14 @@ jobs:
             console.log(`changedEnvs: ${JSON.stringify(changedEnvs)}`)
             core.setOutput("allChanges", allChanges)
   lint-changed-dirs:
+    {{ if (eq (len $githubActionsCI.RunsOn) 0) -}}
     runs-on: ubuntu-latest
+    {{ else -}}
+    runs-on: [{{ range $index, $element := $githubActionsCI.RunsOn -}}
+        {{if $index}},{{end -}}
+        {{$element -}}
+    {{end -}}]
+    {{ end -}}
     needs: find-changed-dirs
     strategy:
       matrix:

diff --git a/testdata/github_actions/.github/workflows/fogg_ci.yml b/testdata/github_actions/.github/workflows/fogg_ci.yml
diff --git a/testdata/github_actions/fogg.yml b/testdata/github_actions/fogg.yml
@@ -13,4 +13,7 @@ defaults:
       command: lint
       enabled: true
       test_buckets: 7
+      runs_on:
+        - self-hosted
+        - ARM64
 version: 2