From 22eac50276dd6e2d794e1dff72b3f0e25b1f43ab Mon Sep 17 00:00:00 2001
From: Marten Seemann <martenseemann@gmail.com>
Date: Fri, 15 Sep 2023 23:56:20 +0700
Subject: [PATCH] ci: combine the go generate workflow with the linting
 workflow (#4053)

* ci: combine the go generate workflow with the linting workflow

* reorder
---
 .github/workflows/go-generate.yml | 13 -------------
 .github/workflows/lint.yml        |  5 +++++
 2 files changed, 5 insertions(+), 13 deletions(-)
 delete mode 100644 .github/workflows/go-generate.yml

diff --git a/.github/workflows/go-generate.yml b/.github/workflows/go-generate.yml
deleted file mode 100644
index 4add84e3..00000000
--- a/.github/workflows/go-generate.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-on: [push, pull_request]
-jobs:
-  gogenerate:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v4
-        with:
-          go-version: "1.20.x"
-      - name: Install dependencies
-        run: go build
-      - name: Run code generators
-        run: .github/workflows/go-generate.sh
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index ee56f6e4..1d564861 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -19,13 +19,18 @@ jobs:
             exit 1
           fi
       - name: Check that go.mod is tidied
+        if: success() || failure() # run this step even if the previous one failed
         run: |
           cp go.mod go.mod.orig
           cp go.sum go.sum.orig
           go mod tidy
           diff go.mod go.mod.orig
           diff go.sum go.sum.orig
+      - name: Run code generators
+        if: success() || failure() # run this step even if the previous one failed
+        run: .github/workflows/go-generate.sh
       - name: Check that go mod vendor works
+        if: success() || failure() # run this step even if the previous one failed
         run: |
           cd integrationtests/gomodvendor
           go mod vendor