From ad69897cde93f56409ef57f580d79a56f27a93ea Mon Sep 17 00:00:00 2001
From: Brage <bskjon@outlook.com>
Date: Mon, 17 Jul 2023 00:45:46 +0200
Subject: [PATCH] Updated workflow + gradle tasks

---
 .github/workflows/main.yml | 31 +++++++++++++++++++++++--------
 Reader/Dockerfile          |  2 +-
 Reader/build.gradle.kts    |  5 +++++
 3 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a56029d6..aca1b4d6 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -35,12 +35,17 @@ jobs:
 
       - name: Check if Encode has changed
         id: check-encode
-        run: echo ::set-output name=changed::$(git diff --name-only ${{ github.event.before }} ${{ github.event.after }} 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: Build Encode module
         id: build-encode
         run: |
-          if [ "${{ steps.check-encode.outputs.changed }}" == "Encode" ] || [ "${{ github.event_name }}" == "push" ] || [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
+          if [[ "${{ steps.check-encode.outputs.changed }}" == "true" || "${{ github.event_name }}" == "push" || "${{ github.event_name }}" == "workflow_dispatch" ]]; then
             cd Encode
             chmod +x ./gradlew
             ./gradlew build
@@ -83,12 +88,17 @@ jobs:
 
       - name: Check if Reader has changed
         id: check-reader
-        run: echo ::set-output name=changed::$(git diff --name-only ${{ github.event.before }} ${{ github.event.after }} 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: Build Reader module
         id: build-reader
         run: |
-          if [ "${{ steps.check-reader.outputs.changed }}" == "Reader" ] || [ "${{ github.event_name }}" == "push" ] || [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
+          if [[ "${{ steps.check-reader.outputs.changed }}" == "true" || "${{ github.event_name }}" == "push" || "${{ github.event_name }}" == "workflow_dispatch" ]]; then
             cd Reader
             chmod +x ./gradlew
             ./gradlew build
@@ -129,12 +139,17 @@ jobs:
 
       - name: Check if pyMetadata has changed
         id: check-pymetadata
-        run: echo ::set-output name=changed::$(git diff --name-only ${{ github.event.before }} ${{ github.event.after }} pyMetadata)
-        
+        run: |
+          if [[ $(git diff --name-only ${{ github.event.before }} ${{ github.event.after }} pyMetadata/) ]]; then
+            echo "::set-output name=changed::true"
+          else
+            echo "::set-output name=changed::false"
+          fi
+
       - name: Build pyMetadata module
         id: build-pymetadata
         run: |
-          if [ "${{ steps.check-pymetadata.outputs.changed }}" == "pyMetadata" ] || [ "${{ github.event_name }}" == "push" ] || [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
+          if [[ "${{ steps.check-pymetadata.outputs.changed }}" == "true" || "${{ github.event_name }}" == "push" || "${{ github.event_name }}" == "workflow_dispatch" ]]; then
             cd pyMetadata
             # Add the necessary build steps for your Python module here
             echo "Build completed"
diff --git a/Reader/Dockerfile b/Reader/Dockerfile
index d3798efb..650ad767 100644
--- a/Reader/Dockerfile
+++ b/Reader/Dockerfile
@@ -1,4 +1,4 @@
 FROM bskjon/azuljava:17
 EXPOSE 8080
 
-COPY ./reader.jar /usr/share/app/app.jar
\ No newline at end of file
+COPY ./build/libs/reader.jar /usr/share/app/app.jar
\ No newline at end of file
diff --git a/Reader/build.gradle.kts b/Reader/build.gradle.kts
index 86791d5e..205d22c9 100644
--- a/Reader/build.gradle.kts
+++ b/Reader/build.gradle.kts
@@ -54,4 +54,9 @@ tasks.test {
 tasks.bootJar {
     archiveFileName.set("reader.jar")
     launchScript()
+}
+
+tasks.jar {
+    archivesName.set("reader.jar")
+    archiveBaseName.set("reader")
 }
\ No newline at end of file