From 539dc4743247227d2eb215c3d924e337e904b9b7 Mon Sep 17 00:00:00 2001
From: "ERDC\\RDITLSCW" <samuel.c.williams@erdc.dren.mil>
Date: Tue, 7 Jan 2025 13:55:58 -0600
Subject: [PATCH] consolidated jobs

---
 .github/workflows/black.yml           | 12 ------------
 .github/workflows/flake8.yml          | 20 -------------------
 .github/workflows/lint_and_format.yml | 28 +++++++++++++++++++++++++++
 3 files changed, 28 insertions(+), 32 deletions(-)
 delete mode 100644 .github/workflows/black.yml
 delete mode 100644 .github/workflows/flake8.yml
 create mode 100644 .github/workflows/lint_and_format.yml

diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml
deleted file mode 100644
index b89b02a..0000000
--- a/.github/workflows/black.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-name: Black Styling Check
-
-on: [push, pull_request]
-
-jobs:
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: psf/black@stable
-        with:
-          options: "--check"
\ No newline at end of file
diff --git a/.github/workflows/flake8.yml b/.github/workflows/flake8.yml
deleted file mode 100644
index 1723921..0000000
--- a/.github/workflows/flake8.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-# name: Flake8 Lint
-
-# on: [push, pull_request]
-
-# jobs:
-#   flake8-lint:
-#     runs-on: ubuntu-latest
-#     name: Lint
-#     steps:
-#       - name: Check out source repository
-#         uses: actions/checkout@v3
-#       - name: Set up Python environment
-#         uses: actions/setup-python@v4
-#         with:
-#           python-version: "3.11"
-#       - name: flake8 Lint
-#         uses: py-actions/flake8@v2
-#         with:
-#           ignore: "E203"
-#           max-line-length: "120"
\ No newline at end of file
diff --git a/.github/workflows/lint_and_format.yml b/.github/workflows/lint_and_format.yml
new file mode 100644
index 0000000..46dfa0e
--- /dev/null
+++ b/.github/workflows/lint_and_format.yml
@@ -0,0 +1,28 @@
+name: Linting and Formatting
+
+on: [push, pull_request]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    name: Lint
+    steps:
+      - name: Check out source repository
+        uses: actions/checkout@v3
+      - name: Set up Python environment
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.11"
+      - name: flake8 Lint
+        uses: py-actions/flake8@v2
+        with:
+          ignore: "E203"
+          max-line-length: "120"
+  format:
+    needs: lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: psf/black@stable
+        with:
+          options: "--check"
\ No newline at end of file