From a1fc483b7336f4350b49fd543dbb7a4b53fe4c46 Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jonathan@jlebon.com>
Date: Wed, 20 Jul 2022 09:09:48 -0400
Subject: [PATCH] workflows: merge lints together

They share the same branch and pull request settings. Also makes the
GitHub commit status context used more consistent between the two.
Currently one is "golangci-lint/lint" and the other "lints/ShellCheck".
With this, it'll be "lints/golangci-lint" and "lints/ShellCheck".
---
 .github/workflows/golangci-lint.yml | 43 -----------------------------
 .github/workflows/lints.yml         | 29 +++++++++++++++++++
 2 files changed, 29 insertions(+), 43 deletions(-)
 delete mode 100644 .github/workflows/golangci-lint.yml

diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
deleted file mode 100644
index b0303c10f9..0000000000
--- a/.github/workflows/golangci-lint.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-name: golangci-lint
-
-on:
-  push:
-    branches: [main]
-  pull_request:
-    branches:
-      - main
-      - rhcos-*
-
-permissions:
-  contents: read
-
-jobs:
-  golangci:
-    name: lint
-    runs-on: ubuntu-latest
-    steps:
-      # this is needed by containers/storage which we're using in gangplank
-      - name: Install deps
-        run: sudo apt-get install -y libgpgme-dev libbtrfs-dev libdevmapper-dev
-      - uses: actions/setup-go@v3
-        with:
-          go-version: 1.18
-      - uses: actions/checkout@v3
-      - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
-        with:
-          version: v1.46.2
-          working-directory: gangplank
-          args: --timeout=5m
-      - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
-        with:
-          version: v1.46.2
-          working-directory: mantle
-          args: --timeout=5m
-      - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
-        with:
-          version: v1.46.2
-          working-directory: schema
-          args: --timeout=5m
diff --git a/.github/workflows/lints.yml b/.github/workflows/lints.yml
index 2dc9118627..0d2dc2e4ea 100644
--- a/.github/workflows/lints.yml
+++ b/.github/workflows/lints.yml
@@ -22,3 +22,32 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
       - run: make shellcheck
+  golangci-lint:
+    name: golangci-lint
+    runs-on: ubuntu-latest
+    steps:
+      # this is needed by containers/storage which we're using in gangplank
+      - name: Install deps
+        run: sudo apt-get install -y libgpgme-dev libbtrfs-dev libdevmapper-dev
+      - uses: actions/setup-go@v3
+        with:
+          go-version: 1.18
+      - uses: actions/checkout@v3
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v3
+        with:
+          version: v1.46.2
+          working-directory: gangplank
+          args: --timeout=5m
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v3
+        with:
+          version: v1.46.2
+          working-directory: mantle
+          args: --timeout=5m
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v3
+        with:
+          version: v1.46.2
+          working-directory: schema
+          args: --timeout=5m