Changelog

paths

trying to get the client uploader to work

script fix

.github/workflows/upload-client.yml

@@ -39,28 +39,22 @@ jobs:
 
       - name: Package Client
         run: dotnet build -c Release -r win-x64 Content.Client
+      - name: Package Server
+        run: dotnet build -c Release -r win-x64 Content.Server
 
       - name: Checkout Target Repo (Compiled Client)
         uses: actions/checkout@v4
         with:
-          repository: taislin/civ14_compiled_client
+          repository: taislin/civ14_compileds
           token: ${{ secrets.TARGET_REPO_TOKEN }}
           path: target-repo
 
-      - name: Debug Build Output
-        run: |
-          echo "Current directory: $(pwd)"
-          ls -la
-          find . -type d -name "bin"  # Find all 'bin' directories
-          find . -type f -name "*.dll"  # Find compiled DLLs
-          find . -type f -name "*.exe"  # Find compiled EXEs
-          ls -la ./bin/Content.Client/ || echo "Directory not found"
-
       - name: Update Target Repo
         run: |
           # Copy compiled output to target-repo/
-          rsync -av --ignore-existing ./bin/Content.Client/win-x64/ target-repo/ || true
+          rsync -av --ignore-existing ./bin/Content.Client/win-x64/ target-repo/Content.Client/ || true
           cd target-repo
+          cd Content.Client
           git config user.name "GitHub Action"
           git config user.email "action@github.com"
           git add .
@@ -70,3 +64,16 @@ jobs:
           else
             echo "No changes detected, skipping commit and push"
           fi
+          cd -
+          # Copy compiled output to target-repo/
+          rsync -av --ignore-existing ./../bin/Content.Server/win-x64/ Content.Server/ || true
+          cd Content.Server
+          git config user.name "GitHub Action"
+          git config user.email "action@github.com"
+          git add .
+          if git status --porcelain | grep .; then
+            git commit -m "Update compiled server from Civ14 - changed files only"
+            git push
+          else
+            echo "No changes detected, skipping commit and push"
+          fi

Resources/Changelog/Changelog.yml

@@ -56,3 +56,21 @@ Entries:
     id: 5
     time: "2025-04-13T00:00:00.0000000+00:00"
     url: https://github.com/Civ13/Civ14/pull/107
+
+  - author: Taislin
+    changes:
+      - message: Fixed door atmos bug.
+        type: Fix
+      - message: Fixed missing recipes for anvil and kiln.
+        type: Fix
+      - message: Fixed missing plant sprites.
+        type: Fix
+      - message: Fixed fuel consumption bug for braziers.
+        type: Fix
+      - message: Weather should match the seasons now.
+        type: Add
+      - message: Added deep water to the middle of the rivers.
+        type: Add
+    id: 5
+    time: "2025-04-16T00:00:00.0000000+00:00"
+    url: https://github.com/Civ13/Civ14/pull/118