From de948e4b19812872e8f2471175c5e13a56c8a01d Mon Sep 17 00:00:00 2001
From: Evgenij Ivankin <e.ivankin@innopolis.university>
Date: Thu, 4 Jul 2024 22:25:49 +0300
Subject: [PATCH] make single CI workflow

---
 .github/workflows/{test.yml => ci.yml} | 15 +++++++++++++++
 .github/workflows/ruff-lint.yml        | 16 ----------------
 2 files changed, 15 insertions(+), 16 deletions(-)
 rename .github/workflows/{test.yml => ci.yml} (93%)
 delete mode 100644 .github/workflows/ruff-lint.yml

diff --git a/.github/workflows/test.yml b/.github/workflows/ci.yml
similarity index 93%
rename from .github/workflows/test.yml
rename to .github/workflows/ci.yml
index 14ea357..8d3e2fb 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/ci.yml
@@ -1,8 +1,23 @@
 name: Test & Build Python Package
 on: push
 jobs:
+  ruff-format:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: chartboost/ruff-action@v1
+        with:
+          args: format --check
+
+  ruff-check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: chartboost/ruff-action@v1
+
   test-and-build:
     runs-on: ubuntu-latest
+    needs: [ruff-check, ruff-format]
 
     steps:
       - name: Checkout
diff --git a/.github/workflows/ruff-lint.yml b/.github/workflows/ruff-lint.yml
deleted file mode 100644
index c3b73a5..0000000
--- a/.github/workflows/ruff-lint.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: Ruff Linter
-on: [ push, pull_request ]
-jobs:
-  ruff-format:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: chartboost/ruff-action@v1
-        with:
-          args: format --check
-
-  ruff-check:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: chartboost/ruff-action@v1
\ No newline at end of file