Merge branch 'master' into ianmeatyummy

DeltaV-Station · Sep 27, 2023 · 59288f3 · 59288f3
2 parents 728e6df + c7e8828
commit 59288f3
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 15 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -5,8 +5,8 @@ concurrency:
 
 on:
   workflow_dispatch:
-  schedule:
-    - cron: '0 10 * * *'
+#  schedule:
+#    - cron: '0 10 * * *'
 
 jobs:
   build:
@@ -45,20 +45,22 @@ jobs:
     - name: Upload files to centcomm
       uses: appleboy/scp-action@master
       with:
-        host: centcomm.spacestation14.io
-        username: wizards-build-push
-        key: ${{ secrets.CENTCOMM_WIZARDS_BUILDS_PUSH_KEY }}
+        host: ${{ secrets.PUBLISH_HOST }}
+        username: ${{ secrets.PUBLISH_USER }}
+        key: ${{ secrets.PUBLISH_KEY }}
+        port: ${{ secrets.PUBLISH_PORT }}
         source: "release/${{ github.sha }}"
-        target: "/home/wizards-build-push/builds_dir/builds/"
+        target: "/var/www/builds.delta-v.org/delta-v-rebase/builds/"
         strip_components: 1
 
     - name: Update manifest JSON
       uses: appleboy/ssh-action@master
       with:
-        host: centcomm.spacestation14.io
-        username: wizards-build-push
-        key: ${{ secrets.CENTCOMM_WIZARDS_BUILDS_PUSH_KEY }}
-        script: /home/wizards-build-push/push.ps1 ${{ github.sha }}
+        host: ${{ secrets.PUBLISH_HOST }}
+        username: ${{ secrets.PUBLISH_USER }}
+        key: ${{ secrets.PUBLISH_KEY }}
+        port: ${{ secrets.PUBLISH_PORT }}
+        script: /home/${{ secrets.PUBLISH_USER }}/publish/rebasepush.ps1 ${{ github.sha }}
 
     - name: Publish changelog (Discord)
       run: Tools/actions_changelogs_since_last_run.py

diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
@@ -107,3 +107,9 @@ Entries:
       message: Merged latest changes from Wizden
   id: 17
   time: '2023-09-27T19:59:13.0000000+00:00'
+- author: FluffiestFloof
+  changes:
+    - type: Remove
+      message: Removed Dwarf from roundstart choices.
+  id: 18
+  time: '2023-09-27T21:09:01.0000000+00:00'
diff --git a/Resources/Prototypes/Species/dwarf.yml b/Resources/Prototypes/Species/dwarf.yml
@@ -1,7 +1,7 @@
 - type: species
   id: Dwarf
   name: species-name-dwarf
-  roundStart: true
+  roundStart: false # DeltaV - Disable dwarf
   prototype: MobDwarf
   sprites: MobHumanSprites
   markingLimits: MobHumanMarkingLimits

diff --git a/Tools/gen_build_info.py b/Tools/gen_build_info.py
@@ -20,10 +20,10 @@
 ]
 
 VERSION = os.environ['GITHUB_SHA']
-FORK_ID = "wizards"
-BUILD_URL = f"https://cdn.centcomm.spacestation14.com/builds/wizards/builds/{{FORK_VERSION}}/{FILE}"
-MANIFEST_URL = f"https://cdn.centcomm.spacestation14.com/cdn/version/{{FORK_VERSION}}/manifest"
-MANIFEST_DOWNLOAD_URL = f"https://cdn.centcomm.spacestation14.com/cdn/version/{{FORK_VERSION}}/download"
+FORK_ID = "delta-v"
+BUILD_URL = f"https://builds.delta-v.org/{{FORK_ID}}/builds/{{FORK_VERSION}}/{FILE}"
+MANIFEST_URL = f"https://cdn.delta-v.org/version/{{FORK_VERSION}}/manifest"
+MANIFEST_DOWNLOAD_URL = f"https://cdn.delta-v.org/version/{{FORK_VERSION}}/download"
 
 def main() -> None:
     client_file = os.path.join("release", FILE)