From d5a0f4e2bdfa3be1ce3286b0ac6e3f1c692b1464 Mon Sep 17 00:00:00 2001
From: Marvin Buss <marvin.buss@gmail.com>
Date: Mon, 15 Jan 2024 18:31:50 +0100
Subject: [PATCH 1/2] Cosmetic Workflow Changes

---
 .github/workflows/_containerTemplate.yml           |  2 +-
 .github/workflows/_functionAppDeployTemplate.yml   |  2 +-
 .github/workflows/_functionAppTestTemplate.yml     |  2 +-
 .../workflows/_terraformEnvironmentTemplate.yml    |  6 +++---
 .github/workflows/lint.yml                         | 14 ++++++++++----
 .github/workflows/newMajorVersion.yml              |  1 -
 .github/workflows/terraform.yml                    |  2 ++
 7 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/_containerTemplate.yml b/.github/workflows/_containerTemplate.yml
index e535e15..491e2a5 100644
--- a/.github/workflows/_containerTemplate.yml
+++ b/.github/workflows/_containerTemplate.yml
@@ -37,7 +37,7 @@ on:
 jobs:
   deployment:
     name: Container Build & Push
-    runs-on: ubuntu-latest
+    runs-on: [ubuntu-latest]
     continue-on-error: false
     environment: ${{ inputs.environment }}
 
diff --git a/.github/workflows/_functionAppDeployTemplate.yml b/.github/workflows/_functionAppDeployTemplate.yml
index 2325387..cc83ef6 100644
--- a/.github/workflows/_functionAppDeployTemplate.yml
+++ b/.github/workflows/_functionAppDeployTemplate.yml
@@ -40,7 +40,7 @@ on:
 jobs:
   deployment:
     name: Function App Deploy
-    runs-on: self-hosted
+    runs-on: [self-hosted]
     continue-on-error: false
     environment: ${{ inputs.environment }}
 
diff --git a/.github/workflows/_functionAppTestTemplate.yml b/.github/workflows/_functionAppTestTemplate.yml
index a7de875..bb739b4 100644
--- a/.github/workflows/_functionAppTestTemplate.yml
+++ b/.github/workflows/_functionAppTestTemplate.yml
@@ -16,7 +16,7 @@ on:
 jobs:
   deployment:
     name: Function App Test
-    runs-on: ubuntu-latest
+    runs-on: [ubuntu-latest]
     continue-on-error: false
 
     steps:
diff --git a/.github/workflows/_terraformEnvironmentTemplate.yml b/.github/workflows/_terraformEnvironmentTemplate.yml
index 5755839..819451c 100644
--- a/.github/workflows/_terraformEnvironmentTemplate.yml
+++ b/.github/workflows/_terraformEnvironmentTemplate.yml
@@ -50,7 +50,7 @@ permissions:
 jobs:
   lint:
     name: Terraform Lint
-    runs-on: ubuntu-latest
+    runs-on: [ubuntu-latest]
     continue-on-error: false
 
     steps:
@@ -96,7 +96,7 @@ jobs:
 
   plan:
     name: Terraform Plan
-    runs-on: self-hosted
+    runs-on: [self-hosted]
     continue-on-error: false
     environment: ${{ inputs.environment }}
     needs: [lint]
@@ -190,7 +190,7 @@ jobs:
 
   apply:
     name: Terraform Apply
-    runs-on: self-hosted
+    runs-on: [self-hosted]
     continue-on-error: false
     environment: ${{ inputs.environment }}
     if: github.event_name == 'push' || github.event_name == 'release'
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 1719ddc..af15041 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -10,7 +10,8 @@ on:
 jobs:
   lint:
     name: Lint and Test
-    runs-on: ubuntu-latest
+    runs-on: [ubuntu-latest]
+    continue-on-error: false
 
     steps:
       # Setup Python 3.11
@@ -37,8 +38,13 @@ jobs:
       - name: Run Linting
         id: linting
         run: |
-          pip install -r requirements.txt -q
+          echo "Install dependencies"
+          python3 -m pip install -r requirements.txt -q
+
+          echo "Initialize Git"
           git init
           git add *
-          pre-commit install --install-hooks
-          pre-commit run --all-files --verbose
+
+          echo "Run pre-commit"
+          python3 -m pre_commit install --install-hooks
+          python3 -m pre_commit run --all-files --verbose
diff --git a/.github/workflows/newMajorVersion.yml b/.github/workflows/newMajorVersion.yml
index 608914e..348f573 100644
--- a/.github/workflows/newMajorVersion.yml
+++ b/.github/workflows/newMajorVersion.yml
@@ -15,7 +15,6 @@ permissions:
 env:
   TAG_NAME: ${{ github.event.inputs.tag_name || github.event.release.tag_name }}
 
-
 jobs:
   update_tag:
     name: Update the major tag to include the ${{ github.event.inputs.tag_name || github.event.release.tag_name }} changes
diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml
index badcb32..23bfadd 100644
--- a/.github/workflows/terraform.yml
+++ b/.github/workflows/terraform.yml
@@ -6,6 +6,7 @@ on:
     paths:
       - "**.tf"
       - "code/infra/**"
+      - ".github/workflows/deployment.yml"
 
   pull_request:
     branches:
@@ -13,6 +14,7 @@ on:
     paths:
       - "**.tf"
       - "code/infra/**"
+      - ".github/workflows/deployment.yml"
 
 jobs:
   terraform_dev:

From 262cdd30bacca4e3a6fa170d469c16b1a31cf156 Mon Sep 17 00:00:00 2001
From: Marvin Buss <marvin.buss@gmail.com>
Date: Mon, 15 Jan 2024 18:43:27 +0100
Subject: [PATCH 2/2] Update trigger

---
 .github/workflows/terraform.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml
index 23bfadd..892341a 100644
--- a/.github/workflows/terraform.yml
+++ b/.github/workflows/terraform.yml
@@ -6,7 +6,7 @@ on:
     paths:
       - "**.tf"
       - "code/infra/**"
-      - ".github/workflows/deployment.yml"
+      - ".github/workflows/terraform.yml"
 
   pull_request:
     branches:
@@ -14,7 +14,7 @@ on:
     paths:
       - "**.tf"
       - "code/infra/**"
-      - ".github/workflows/deployment.yml"
+      - ".github/workflows/terraform.yml"
 
 jobs:
   terraform_dev: