From b3b6aa38ff4ff7a0f9950825e4206e2e3d5acd8f Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@golov.de>
Date: Fri, 24 Nov 2023 14:44:49 +0100
Subject: [PATCH] move rubocop into foreman.yml

---
 .github/workflows/foreman.yml | 20 +++++++++++++++++++-
 .github/workflows/rubocop.yml | 19 -------------------
 2 files changed, 19 insertions(+), 20 deletions(-)
 delete mode 100644 .github/workflows/rubocop.yml

diff --git a/.github/workflows/foreman.yml b/.github/workflows/foreman.yml
index cac6faa00b6..ab7b1f72a24 100644
--- a/.github/workflows/foreman.yml
+++ b/.github/workflows/foreman.yml
@@ -25,10 +25,28 @@ jobs:
         id: build_matrix
         uses: theforeman/gha-matrix-builder@v0
 
+  rubocop:
+    name: Rubocop
+    needs: setup_matrix
+    runs-on: ubuntu-latest
+    env:
+      BUNDLE_WITHOUT: assets:console:development:dynflow_sidekiq:ec2:journald:jsonp:libvirt:openid:openstack:ovirt:redis:service:telemetry:vmware
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ fromJson(needs.setup_matrix.outputs.matrix).ruby[0] }}
+          bundler-cache: true
+      - name: Run rubocop
+        run: bundle exec rubocop -P
+
   tests:
     name: "${{ matrix.task }} - Ruby ${{ matrix.ruby }} and Node ${{ matrix.node }} on PostgreSQL ${{ matrix.postgresql }}"
     runs-on: ubuntu-latest
-    needs: setup_matrix
+    needs:
+      - setup_matrix
+      - rubocop
     services:
       postgres:
         image: 'postgres:${{ matrix.postgresql }}'
diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml
deleted file mode 100644
index 412c350801a..00000000000
--- a/.github/workflows/rubocop.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-name: RuboCop
-on: [pull_request]
-env:
-  BUNDLE_WITHOUT: assets:console:development:dynflow_sidekiq:ec2:journald:jsonp:libvirt:openid:openstack:ovirt:redis:service:telemetry:vmware
-permissions:
-  contents: read
-
-jobs:
-  rubocop:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 2.7
-          bundler-cache: true
-      - name: Run rubocop
-        run: bundle exec rubocop -P