JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:NIGHTLY_BUILDING_20.01.…

…2025.21738a_[CItest]
Loweredgames · Jan 20, 2025 · 482da5a · 482da5a
1 parent a2fba40
commit 482da5a
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 8 deletions.
diff --git a/.github/workflows/nightly_release.yml b/.github/workflows/nightly_release.yml
@@ -15,12 +15,23 @@ jobs:
         with:
           fetch-depth: 2
 
-      - name: Check if Nightly Release Building changed
+      - name: Get file changes
+        id: changed-files
+        run: |
+          DIFF=$(git diff HEAD^ HEAD -- "datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json")
+          echo "diff<<EOF" >> $GITHUB_OUTPUT
+          echo "$DIFF" >> $GITHUB_OUTPUT
+          echo "EOF" >> $GITHUB_OUTPUT
+
+      - name: Check if Nightly Building changed
         id: check
-        shell: bash
         run: |
-          if git diff HEAD^ HEAD -- "datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json" | grep -q '"Nightly Building"'; then
-            echo "changed=true" >> $GITHUB_OUTPUT
+          if echo "${{ steps.changed-files.outputs.diff }}" | grep -q '"Nightly Building"'; then
+            if ! echo "${{ steps.changed-files.outputs.diff }}" | grep -q '"Release Building"'; then
+              echo "changed=true" >> $GITHUB_OUTPUT
+            else
+              echo "changed=false" >> $GITHUB_OUTPUT
+            fi
           else
             echo "changed=false" >> $GITHUB_OUTPUT
           fi

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -15,12 +15,23 @@ jobs:
         with:
           fetch-depth: 2
 
+      - name: Get file changes
+        id: changed-files
+        run: |
+          DIFF=$(git diff HEAD^ HEAD -- "datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json")
+          echo "diff<<EOF" >> $GITHUB_OUTPUT
+          echo "$DIFF" >> $GITHUB_OUTPUT
+          echo "EOF" >> $GITHUB_OUTPUT
+
       - name: Check if Release Building changed
         id: check
-        shell: bash
         run: |
-          if git diff HEAD^ HEAD -- "datapacks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json" | grep -q '"Release Building"'; then
-            echo "changed=true" >> $GITHUB_OUTPUT
+          if echo "${{ steps.changed-files.outputs.diff }}" | grep -q '"Release Building"'; then
+            if ! echo "${{ steps.changed-files.outputs.diff }}" | grep -q '"Nightly Building"'; then
+              echo "changed=true" >> $GITHUB_OUTPUT
+            else
+              echo "changed=false" >> $GITHUB_OUTPUT
+            fi
           else
             echo "changed=false" >> $GITHUB_OUTPUT
           fi

diff --git a/...cks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json b/...cks/Skyblock CE datapacks/data/skyblock/function/versions/changelog/building_version.json
@@ -7,7 +7,7 @@
 
 "Release Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:9testCI",
 
-"Nightly Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:NIGHTLY_BUILDING_20.01.2025.11738a_[CItest]",
+"Nightly Building": "JE-1.21/1.21.1-6.0.0-Skyblock_Classic_Edition:NIGHTLY_BUILDING_20.01.2025.21738a_[CItest]",
 
 "Data_pack": "TRUE",