Merge pull request #204 from jbrunton/remove-setup-go-jsonnet

remove setup-go from jsonnet templates
jbrunton · Jun 27, 2021 · 17d10e9 · 17d10e9
2 parents 42d23e0 + dd236d6
commit 17d10e9
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 34 deletions.
diff --git a/.gflows/examples/default-jsonnet/libs/steps.libsonnet b/.gflows/examples/default-jsonnet/libs/steps.libsonnet
@@ -14,10 +14,16 @@
   },
 
   checkout: steps.uses('actions/checkout@v2'),
-  
-  setup_go: steps.uses('actions/setup-go@v2') {
+
+  setup_gflows: steps.uses('jbrunton/setup-gflows@v1') {
     with: {
-      'go-version': '^1.14.4'
+      token: "${{ secrets.GITHUB_TOKEN }}",
     }
-  }
+  },
+
+  check_workflows: steps.named('validate workflows', 'gflows check') {
+    env: {
+      GFLOWS_CONFIG: '.gflows/examples/default-jsonnet/config.yml'
+    },
+  },
 }
diff --git a/.gflows/examples/default-jsonnet/workflows/ex-default-jsonnet-gflows.jsonnet b/.gflows/examples/default-jsonnet/workflows/ex-default-jsonnet-gflows.jsonnet
@@ -7,17 +7,8 @@ local check_workflows_job = {
   'runs-on': 'ubuntu-latest',
   steps: [
     steps.checkout,
-    steps.setup_go,
-    steps.uses('jbrunton/setup-gflows@v1') {
-      with: {
-        token: "${{ secrets.GITHUB_TOKEN }}",
-      }
-    },
-    steps.named('validate workflows', 'gflows check') {
-      env: {
-        GFLOWS_CONFIG: '.gflows/examples/default-jsonnet/config.yml'
-      },
-    },
+    steps.setup_gflows,
+    steps.check_workflows
   ]
 };
 

diff --git a/.github/workflows/ex-default-jsonnet-gflows.yml b/.github/workflows/ex-default-jsonnet-gflows.yml
@@ -6,9 +6,6 @@
     "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 }}"

diff --git a/static/content/jsonnet/libs/steps.libsonnet b/static/content/jsonnet/libs/steps.libsonnet
@@ -14,10 +14,16 @@
   },
 
   checkout: steps.uses('actions/checkout@v2'),
-  
-  setup_go: steps.uses('actions/setup-go@v2') {
+
+  setup_gflows: steps.uses('jbrunton/setup-gflows@v1') {
     with: {
-      'go-version': '^1.14.4'
+      token: "${{ secrets.GITHUB_TOKEN }}",
     }
-  }
+  },
+
+  check_workflows: steps.named('validate workflows', 'gflows check') {
+    env: {
+      GFLOWS_CONFIG: '$CONFIG_PATH'
+    },
+  },
 }
diff --git a/static/content/jsonnet/workflows/gflows.jsonnet b/static/content/jsonnet/workflows/gflows.jsonnet
@@ -7,17 +7,8 @@ local check_workflows_job = {
   'runs-on': 'ubuntu-latest',
   steps: [
     steps.checkout,
-    steps.setup_go,
-    steps.uses('jbrunton/setup-gflows@v1') {
-      with: {
-        token: "${{ secrets.GITHUB_TOKEN }}",
-      }
-    },
-    steps.named('validate workflows', 'gflows check') {
-      env: {
-        GFLOWS_CONFIG: '$CONFIG_PATH'
-      },
-    },
+    steps.setup_gflows,
+    steps.check_workflows
   ]
 };