From 9065b5610083004a00ab1cbcbf326d3d9531cc59 Mon Sep 17 00:00:00 2001
From: Brage <bskjon@outlook.com>
Date: Fri, 21 Jul 2023 00:06:33 +0200
Subject: [PATCH] Updated main.yaml

---
 .github/workflows/main.yml | 67 ++++++++++++++------------------------
 1 file changed, 25 insertions(+), 42 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ae829278..431a548f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -87,23 +87,14 @@ jobs:
   build-encode:
     needs: build-commoncode
     runs-on: ubuntu-latest
-    if: false
     #if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
 
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
 
-      - name: Check if Encode has changed
-        id: check-encode
-        run: |
-          if [[ $(git diff --name-only ${{ github.event.before }} ${{ github.event.after }} Encode/) ]]; then
-            echo "::set-output name=changed::true"
-          else
-            echo "::set-output name=changed::false"
-          fi
-
       - name: Cache CommonCode Gradle dependencies
+        if: env.job_run_encode == 'true'
         id: cache-gradle
         uses: actions/cache@v2
         with:
@@ -112,30 +103,29 @@ jobs:
 
 
       - name: Build Encode module
+        if: env.job_run_encode == 'true'
         id: build-encode
         run: |
-          if [[ "${{ steps.check-encode.outputs.changed }}" == "true" || "${{ github.event_name }}" == "push" || "${{ github.event_name }}" == "workflow_dispatch" ]]; then
-            cd Encode
-            chmod +x ./gradlew
-            ./gradlew build
-            echo "Build completed"
-          else
-            echo "Encode has not changed. Skipping Encode module build."
-            echo "::set-output name=job_skipped::true"
-          fi
+          cd Encode
+          chmod +x ./gradlew
+          ./gradlew build
+          echo "Build completed"
+
 
       - name: Generate Docker image tag
+        if: env.job_run_encode == 'true'
         id: docker-tag
         run: echo "::set-output name=tag::$(date -u +'%Y.%m.%d')-$(uuidgen | cut -c 1-8)"
 
       - name: Docker login
+        if: env.job_run_encode == 'true'
         uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
         with:
           username: ${{ secrets.DOCKER_HUB_NAME }}
           password: ${{ secrets.DOCKER_HUB_TOKEN }}
 
       - name: Build and push Docker image
-        if: (steps.build-encode.outputs.job_skipped != 'true' && github.event_name == 'push') || github.event_name == 'workflow_dispatch'
+        if: env.job_run_encode == 'true'
         uses: docker/build-push-action@v2
         with:
           context: ./Encode
@@ -148,22 +138,14 @@ jobs:
   build-reader:
     needs: build-commoncode
     runs-on: ubuntu-latest
-    if: env.job_run_reader == 'true'
 
     steps:
       - name: Checkout repository
+        if: env.job_run_reader == 'true'
         uses: actions/checkout@v2
 
-      - name: Check if Reader has changed
-        id: check-reader
-        run: |
-          if [[ $(git diff --name-only ${{ github.event.before }} ${{ github.event.after }} Reader/) ]]; then
-            echo "::set-output name=changed::true"
-          else
-            echo "::set-output name=changed::false"
-          fi
-
       - name: Cache CommonCode Gradle dependencies
+        if: env.job_run_reader == 'true'
         id: cache-gradle
         uses: actions/cache@v2
         with:
@@ -172,29 +154,27 @@ jobs:
 
       - name: Build Reader module
         id: build-reader
+        if: env.job_run_reader == 'true'
         run: |
-          if [[ "${{ steps.check-reader.outputs.changed }}" == "true" || "${{ github.event_name }}" == "push" || "${{ github.event_name }}" == "workflow_dispatch" ]]; then
-            cd Reader
-            chmod +x ./gradlew
-            ./gradlew build
-            echo "Build completed"
-          else
-            echo "Reader has not changed. Skipping Reader module build."
-            echo "::set-output name=job_skipped::true"
-          fi
+          cd Reader
+          chmod +x ./gradlew
+          ./gradlew build
+          echo "Build completed"
 
       - name: Generate Docker image tag
+        if: env.job_run_reader == 'true'
         id: docker-tag
         run: echo "::set-output name=tag::$(date -u +'%Y.%m.%d')-$(uuidgen | cut -c 1-8)"
 
       - name: Docker login
+        if: env.job_run_reader == 'true'
         uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
         with:
           username: ${{ secrets.DOCKER_HUB_NAME }}
           password: ${{ secrets.DOCKER_HUB_TOKEN }}
 
       - name: Build and push Docker image
-        if: (steps.build-reader.outputs.job_skipped != 'true' && github.event_name == 'push') || github.event_name == 'workflow_dispatch'
+        if: env.job_run_reader == 'true'
         uses: docker/build-push-action@v2
         with:
           context: ./Reader
@@ -208,16 +188,16 @@ jobs:
 
   build-pymetadata:
     needs: pre-check
-    if: env.job_run_pyMetadata == 'true'
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout repository
+        if: env.job_run_pyMetadata == 'true'
         uses: actions/checkout@v2
 
       - name: Build pyMetadata module
         id: build-pymetadata
-        if: steps.check-pymetadata.outputs.skip == 'false' # skip dette trinnet hvis pyMetadata ikke har endringer
+        if: env.job_run_pyMetadata == 'true'
         run: |
           if [[ "${{ steps.check-pymetadata.outputs.changed }}" == "true" || "${{ github.event_name }}" == "push" || "${{ github.event_name }}" == "workflow_dispatch" ]]; then
             cd pyMetadata
@@ -229,16 +209,19 @@ jobs:
           fi
 
       - name: Generate Docker image tag
+        if: env.job_run_pyMetadata == 'true'
         id: docker-tag
         run: echo "::set-output name=tag::$(date -u +'%Y.%m.%d')-$(uuidgen | cut -c 1-8)"
 
       - name: Docker login
+        if: env.job_run_pyMetadata == 'true'
         uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
         with:
           username: ${{ secrets.DOCKER_HUB_NAME }}
           password: ${{ secrets.DOCKER_HUB_TOKEN }}
 
       - name: Build and push Docker image
+        if: env.job_run_pyMetadata == 'true'
         uses: docker/build-push-action@v2
         with:
           context: ./pyMetadata