Merge pull request #35 from ajschofield/feature/ci-tests

pr: update github actions workflow

2 files changed, 21 insertions, 48 deletions

diff --git a/.github/workflows/python.yml b/.github/workflows/on-commit.yml
index 7d5b5b1..e429651 100644
--- a/.github/workflows/python.yml
+++ b/.github/workflows/on-commit.yml
@@ -1,13 +1,11 @@
-name: python-quality-checks
+name: commit-qc-checks
 
 on:
     push:
-        branches: [development]
-    pull_request:
-        branches: [development, staging]
+        branches-ignore:
+            - 'main'
 
 jobs:
-
     check-if-py-files-exist:
         runs-on: ubuntu-latest
         outputs:
@@ -28,23 +26,35 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - uses : actions/checkout@v2
-            - name : Setup
+            - name : 'Python: Setup'
               uses : actions/setup-python@v2
               with:
                 python-version: 3.11
-            - name : Dependencies
+            - name : 'Python: Install Dependencies'
               run: |
                 python -m pip install --upgrade pip
                 pip install flake8 pylint black bandit safety
-            - name : Linting
+            - name : 'Python: Linting'
               run: |
                 flake8 .
                 find . -name "*.py" | xargs pylint
-            - name : Formatting
+            - name : 'Python: Formatting'
               run: |
                 black --check .
-            - name: Security
+            - name: 'Python: Security'
               run: |
                 bandit -r .
                 safety check
-                
\ No newline at end of file
+            - name: 'Terraform: Setup'
+              uses: hashicorp/setup-terraform@v3
+              with:
+                terraform_version: latest
+            - name: 'Terraform: Formatting'
+              working-directory: ./terraform
+              run: terraform fmt -check -recursive
+            - name: 'Terraform: Initialise'
+              working-directory: ./terraform
+              run: terraform init -backend=false
+            - name: 'Terraform: Validate'
+              working-directory: ./terraform
+              run: terraform validate
diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml
deleted file mode 100644
index c349756..0000000
--- a/.github/workflows/terraform.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-name: terraform-quality-checks
-
-on:
-    push:
-        branches: [development]
-        paths:
-            - 'terraform/**.tf'
-            - 'terraform/**.tfvars'
-    pull_request:
-        branches: [development, staging]
-        paths:
-            - 'terraform/**.tf'
-            - 'terraform/**.tfvars'
-jobs:
-    terraform-validation:
-        runs-on: ubuntu-latest
-        defaults:
-            run:
-                working-directory: ./terraform
-        steps:
-            - uses: actions/checkout@v2
-            - name: Setup Terraform
-              uses: hashicorp/setup-terraform@v1
-              with:
-                  terraform_version: latest # Using the latest version, but not sure if it's the best practice
-            - name: Format
-              run: terraform fmt -check -recursive
-            - name: Init
-              run: terraform init -backend=false
-            - name: Validate
-              run: terraform validate
-            - name: Setup TFLint
-              uses: terraform-linters/setup-tflint@v2
-              with:
-                  tflint_version: latest
-            - name: Run TFLint
-              run: tflint -f compact
\ No newline at end of file