From 1fe1b261a23c418f4163c80d4c89e64db7f4d056 Mon Sep 17 00:00:00 2001
From: Jan Graichen <jgraichen@altimos.de>
Date: Mon, 27 Nov 2023 17:43:55 +0100
Subject: [PATCH] chore: Use single workflow for future integration of releases

---
 .github/workflows/lint.yml | 25 -------------------------
 .github/workflows/test.yml | 20 ++++++++++++++++++++
 2 files changed, 20 insertions(+), 25 deletions(-)
 delete mode 100644 .github/workflows/lint.yml

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
deleted file mode 100644
index 4754cc4..0000000
--- a/.github/workflows/lint.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-name: Lint
-on:
-  - pull_request
-  - push
-
-jobs:
-  rubocop:
-    name: rubocop
-    runs-on: ubuntu-22.04
-
-    env:
-      BUNDLE_WITHOUT: development test
-
-    steps:
-      - uses: actions/checkout@master
-      - uses: ruby/setup-ruby@v1
-        env:
-          BUNDLE_JOBS: 4
-          BUNDLE_RETRY: 3
-        with:
-          ruby-version: 3.1
-          bundler-cache: true
-
-      - name: Run rubocop
-        run: bundle exec rubocop --parallel --color
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6a2717e..e469bce 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -122,3 +122,23 @@ jobs:
         env:
           AMQP_SERVER: amqp://localhost:${{ job.services.rabbitmq.ports[5672] }}
         run: bundle exec rspec --color ${{ matrix.spec }}
+
+  rubocop:
+    name: rubocop
+    runs-on: ubuntu-22.04
+
+    env:
+      BUNDLE_WITHOUT: development test
+
+    steps:
+      - uses: actions/checkout@master
+      - uses: ruby/setup-ruby@v1
+        env:
+          BUNDLE_JOBS: 4
+          BUNDLE_RETRY: 3
+        with:
+          ruby-version: 3.1
+          bundler-cache: true
+
+      - name: Run rubocop
+        run: bundle exec rubocop --parallel --color