Merge pull request #135 from bgilbert/fixes

go: fix CI workflows for coreos/go-json and coreos/pkg
coreos · May 30, 2023 · 76ccaa1 · 76ccaa1
2 parents 2e7a1b1 + ed3575a
commit 76ccaa1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/go/tests.yaml b/go/tests.yaml
@@ -1,4 +1,6 @@
 vars:
+  do_go_lint: true
+  do_go_mod: true
   # go_versions defined in ../config.yaml
   golangci_lint_version: v1.52.2
   go_build_cmd: go build
@@ -33,6 +35,10 @@ files:
 
   - repo: go-json
     path: .github/workflows/go.yml
+    vars:
+      # go-json is mostly imported from Go upstream; we don't exercise
+      # control over the codebase
+      do_go_lint: false
 
   - repo: go-semver
     path: .github/workflows/go.yml
@@ -58,6 +64,8 @@ files:
   - repo: pkg
     path: .github/workflows/go.yml
     vars:
+      # doesn't have a real go.mod
+      do_go_mod: false
       go_versions: [1.15.x, 1.16.x, 1.17.x, 1.18.x, 1.19.x, 1.20.x]
       go_build_cmd: ./build.sh
       go_test_cmd: ./test.sh

diff --git a/go/tests.yml b/go/tests.yml
@@ -56,8 +56,10 @@ jobs:
       shell: bash
       run: brew install {{ brew_dependencies | join(sep=" ") }}
 {%- endif %}
+{%- if do_go_mod %}
     - name: Check modules
       run: go mod verify
+{%- endif %}
 {%- if go_build_cmd %}
     - name: Build
 {%- if do_multi_os %}
@@ -70,6 +72,7 @@ jobs:
       shell: bash
 {%- endif %}
       run: {{ go_test_cmd }}
+{%- if do_go_lint %}
     - name: Run linter
       uses: golangci/golangci-lint-action@v3
 {%- if do_multi_os %}
@@ -78,6 +81,7 @@ jobs:
       with:
         version: {{ golangci_lint_version }}
         args: -E=gofmt --timeout=30m0s
+{%- endif %}
 
 {%- if go_generated_dirs %}
   regenerate: