Merge pull request #48 from ajschofield/ci-cd-branch

pr: makefile & new github action workflow

2 files changed, 10 insertions, 55 deletions

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 372d0b3..db51d20 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,19 +1,24 @@
 name: deploy-terraform
 
 on:
-  push:
+  pull-request:
     branches:
-      - test-ci/**  # Adjust the branch based on our deployment strategy
+      - main
+  pull:
+    branches:
+      - main
+      
 
 jobs:
   deploy-terraform:
     name: Deploy Terraform
     runs-on: ubuntu-latest
-    environment: test-env
+    #needs: run-checks (must ref on-commit.yml file)
+    environment: production
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4
-
+      
       - name: Install Terraform
         uses: hashicorp/setup-terraform@v3
 
@@ -34,4 +39,4 @@ jobs:
 
       - name: Terraform Apply
         working-directory: terraform
-        run: terraform apply --auto-approve
\ No newline at end of file
+        run: terraform apply --auto-approve
diff --git a/.github/workflows/on-commit.yml b/.github/workflows/on-commit.yml
deleted file mode 100644
index fd9ffb8..0000000
--- a/.github/workflows/on-commit.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-name: commit-qc-checks
-
-on:
-    push:
-        branches-ignore:
-            - 'main'
-
-jobs:
-    python-quality-checks:
-        runs-on: ubuntu-latest
-        steps:
-            - uses : actions/checkout@v4
-            - name : 'Python: Setup'
-              uses : actions/setup-python@v5
-              with:
-                python-version: 3.11
-            - name : 'Python: Install Dependencies'
-              run: |
-                python -m pip install --upgrade pip
-                pip install flake8 pylint black bandit safety
-              continue-on-error: true
-            - name : 'Python: Linting'
-              run: |
-                flake8 .
-                find . -name "*.py" | xargs pylint
-              continue-on-error: true
-            - name : 'Python: Formatting'
-              run: |
-                black --check .
-              continue-on-error: true
-    terraform-quality-checks:
-        runs-on: ubuntu-latest
-        steps:
-            - uses : actions/checkout@v4
-            - name: 'Terraform: Setup'
-              uses: hashicorp/setup-terraform@v3
-              with:
-                terraform_version: latest
-            - name: 'Terraform: Formatting'
-              working-directory: terraform
-              run: terraform fmt -check -recursive
-              continue-on-error: true
-            - name: 'Terraform: Initialise'
-              working-directory: terraform
-              run: terraform init -backend=false
-              continue-on-error: true
-            - name: 'Terraform: Validate'
-              working-directory: terraform
-              run: terraform validate
-              continue-on-error: true
\ No newline at end of file