From bfd39b340ef4c1973696aa683e5e1b198cb793c8 Mon Sep 17 00:00:00 2001 From: Debug <49997488+DebugOk@users.noreply.github.com> Date: Wed, 27 Sep 2023 22:12:44 +0200 Subject: [PATCH 1/5] Prepare workflows for test publishes (#48) --- .github/workflows/publish.yml | 22 ++++++++++++---------- Tools/gen_build_info.py | 8 ++++---- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index ae4c4e270f0..c8ce67f71dc 100644 --- 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.psi ${{ github.sha }} - name: Publish changelog (Discord) run: Tools/actions_changelogs_since_last_run.py diff --git a/Tools/gen_build_info.py b/Tools/gen_build_info.py index 0207f568dd7..e4a0a7f9165 100755 --- 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 = "deltav" +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) From 3a7f4a72dcd02786137c050590c327b1494cc009 Mon Sep 17 00:00:00 2001 From: Debug <49997488+DebugOk@users.noreply.github.com> Date: Wed, 27 Sep 2023 22:41:22 +0200 Subject: [PATCH 2/5] Fix spelling mistake Signed-off-by: Debug <49997488+DebugOk@users.noreply.github.com> --- Tools/gen_build_info.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tools/gen_build_info.py b/Tools/gen_build_info.py index e4a0a7f9165..10574468ee0 100755 --- a/Tools/gen_build_info.py +++ b/Tools/gen_build_info.py @@ -20,7 +20,7 @@ ] VERSION = os.environ['GITHUB_SHA'] -FORK_ID = "deltav" +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" From 0cff0101f98ff46d4f6d8e2ef71b22e41a06e1d9 Mon Sep 17 00:00:00 2001 From: Debug <49997488+DebugOk@users.noreply.github.com> Date: Wed, 27 Sep 2023 22:49:02 +0200 Subject: [PATCH 3/5] Another spelling mistake (real) Signed-off-by: Debug <49997488+DebugOk@users.noreply.github.com> --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index c8ce67f71dc..cdc1abde190 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -60,7 +60,7 @@ jobs: username: ${{ secrets.PUBLISH_USER }} key: ${{ secrets.PUBLISH_KEY }} port: ${{ secrets.PUBLISH_PORT }} - script: /home/${{ secrets.PUBLISH_USER }}/publish/rebasepush.psi ${{ github.sha }} + script: /home/${{ secrets.PUBLISH_USER }}/publish/rebasepush.ps1 ${{ github.sha }} - name: Publish changelog (Discord) run: Tools/actions_changelogs_since_last_run.py From 42ba426bd69a6c16b59c54f7bff3fd2447953ea1 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Wed, 27 Sep 2023 23:09:00 +0200 Subject: [PATCH 4/5] 1984 the dwarf (#49) --- Resources/Prototypes/Species/dwarf.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Species/dwarf.yml b/Resources/Prototypes/Species/dwarf.yml index fc800213c19..86743ca2d66 100644 --- 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 From c7e88282afdd3f9c31497ef5fdba1091274f15e2 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 27 Sep 2023 21:09:44 +0000 Subject: [PATCH 5/5] Automatic Changelog Update (#49) --- Resources/Changelog/DeltaVChangelog.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 79771cbf3c8..2fce5a90a57 100644 --- 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'