[update] lets prevent additional commits

HerndonE · Feb 3, 2025 · 2f6c4da · 2f6c4da
1 parent 555d01b
commit 2f6c4da
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -41,12 +41,20 @@ jobs:
 
       - name: Commit combined data.json
         run: |
-          git config --global user.name 'github-actions'
-          git config --global user.email 'github-actions@github.com'
-          git add data/data.json
-          git commit -m "Update combined data.json"
-          git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git
-          git push
+            git config --global user.name 'github-actions'
+            git config --global user.email 'github-actions@github.com'
+            
+            # Stage the changes
+            git add data/data.json
+            
+            # Check if there are any changes before committing
+            if ! git diff --cached --quiet; then
+              git commit -m "Update combined data.json"
+              git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git
+              git push
+            else
+              echo "No changes to commit."
+            fi
 
       # Notify Discord that the process is complete
       - name: Send Discord Notification

diff --git a/data/Battlezone Combat Commander - VSR Games - 2025.json b/data/Battlezone Combat Commander - VSR Games - 2025.json
@@ -202,7 +202,7 @@
 				"Oasis": {
 					"date": "1.9.25",
 					"map": "Oasis",
-					"commanders": "Blue Banana vs dd",
+					"commanders": "Blue Banana vs DD",
 					"factions": "[Hadean, I.S.D.F]",
 					"winning faction": "Hadean",
 					"winner": "Blue Banana",