From 5924072a0d59fcf5e5fe51587dc1dc7855a15dd2 Mon Sep 17 00:00:00 2001
From: Tobias Diez <code@tobiasdiez.com>
Date: Mon, 16 Oct 2023 01:49:29 +0000
Subject: [PATCH] Combine ci linter jobs

---
 .github/workflows/lint.yml | 54 +++++++++-----------------------------
 1 file changed, 13 insertions(+), 41 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 79ca26827b1..afd0406341c 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -14,60 +14,32 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  lint-pycodestyle:
-    name: Code style check with pycodestyle
+  lint:
+    name: Lint
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
       uses: actions/checkout@v4
+
     - name: Merge CI fixes from sagemath/sage
       run: |
         .ci/merge-fixes.sh
       env:
         GH_TOKEN: ${{ github.token }}
+
     - name: Set up Python
       uses: actions/setup-python@v4
       with:
         python-version: 3.9
-    - name: Install pycodestyle
-      run: pip install tox pycodestyle
-    - name: Lint using pycodestyle
+
+    - name: Install dependencies
+      run: pip install tox pycodestyle relint
+
+    - name: Code style check with pycodestyle
       run: tox -e pycodestyle-minimal
-  lint-relint:
-    name: Code style check with relint
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-    - name: Merge CI fixes from sagemath/sage
-      run: |
-        .ci/merge-fixes.sh
-      env:
-        GH_TOKEN: ${{ github.token }}
-    - name: Set up Python
-      uses: actions/setup-python@v4
-      with:
-        python-version: 3.9
-    - name: Install relint
-      run: pip install tox relint
-    - name: Lint using relint
+
+    - name: Code style check with relint
       run: tox -e relint -- src/sage/
-  lint-rst:
-    name: Validate docstring markup as RST
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-    - name: Merge CI fixes from sagemath/sage
-      run: |
-        .ci/merge-fixes.sh
-      env:
-        GH_TOKEN: ${{ github.token }}
-    - name: Set up Python
-      uses: actions/setup-python@v4
-      with:
-        python-version: 3.9
-    - name: Install tox
-      run: pip install tox
-    - name: Lint using tox -e rst
+
+    - name: Validate docstring markup as RST
       run: tox -e rst