From be5719239b1fc1d7779f367ff5d98ec9ca8f1c19 Mon Sep 17 00:00:00 2001
From: Kalibh Halford <kalibh.halford@stfc.ac.uk>
Date: Tue, 14 Nov 2023 13:20:25 +0000
Subject: [PATCH] MAINT: Combined Workflows

---
 .../{pynetbox_codecov.yaml => pynetbox.yaml}  | 11 ++++--
 .github/workflows/pynetbox_pylint.yaml        | 35 -------------------
 .github/workflows/pynetbox_tests.yaml         | 34 ------------------
 3 files changed, 8 insertions(+), 72 deletions(-)
 rename .github/workflows/{pynetbox_codecov.yaml => pynetbox.yaml} (79%)
 delete mode 100644 .github/workflows/pynetbox_pylint.yaml
 delete mode 100644 .github/workflows/pynetbox_tests.yaml

diff --git a/.github/workflows/pynetbox_codecov.yaml b/.github/workflows/pynetbox.yaml
similarity index 79%
rename from .github/workflows/pynetbox_codecov.yaml
rename to .github/workflows/pynetbox.yaml
index e15fbb03..4da0f285 100644
--- a/.github/workflows/pynetbox_codecov.yaml
+++ b/.github/workflows/pynetbox.yaml
@@ -1,4 +1,4 @@
-name: Pynetbox Codecov
+name: Pylint-Tests-Codecov
 
 on:
   push:
@@ -10,7 +10,7 @@ on:
       - ".github/workflows/pynetbox.yaml"
 
 jobs:
-  Codecov:
+  Pylint-Tests-Codecov:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
@@ -28,7 +28,12 @@ jobs:
           python -m pip install --upgrade pip
           cd pynetbox_query
           pip install -r requirements.txt
-          
+
+      - name: Analyse with pylint
+        run: cd pynetbox_query && pylint $(git ls-files '*.py')
+
+      - name: Run tests and collect coverage
+        run: cd pynetbox_query && python3 -m pytest
 
       - name: Run tests and collect coverage
         run: cd pynetbox_query && python3 -m pytest --cov-report xml:coverage.xml --cov
diff --git a/.github/workflows/pynetbox_pylint.yaml b/.github/workflows/pynetbox_pylint.yaml
deleted file mode 100644
index d3ef6377..00000000
--- a/.github/workflows/pynetbox_pylint.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-name: Pynetbox Pylint
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    paths:
-      - "pynetbox_data_uploader/**"
-      - ".github/workflows/pynetbox.yaml"
-
-jobs:
-  Pylint:
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        python-version: ["3.x"]
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v3
-        with:
-          python-version: ${{ matrix.python-version }}
-          cache: "pip"
-
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          cd pynetbox_query
-          pip install -r requirements.txt
-          
-          
-
-      - name: Analyse with pylint
-        run: cd pynetbox_query && pylint $(git ls-files '*.py')
\ No newline at end of file
diff --git a/.github/workflows/pynetbox_tests.yaml b/.github/workflows/pynetbox_tests.yaml
deleted file mode 100644
index bf1e2cb3..00000000
--- a/.github/workflows/pynetbox_tests.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-name: Pynetbox Tests
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    paths:
-      - "pynetbox_data_uploader/**"
-      - ".github/workflows/pynetbox.yaml"
-
-jobs:
-  Test:
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        python-version: ["3.x"]
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v3
-        with:
-          python-version: ${{ matrix.python-version }}
-          cache: "pip"
-
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          cd pynetbox_query
-          pip install -r requirements.txt
-          
-
-      - name: Run tests and collect coverage
-        run: cd pynetbox_query && python3 -m pytest