Merge branch 'Fansana:master' into Tilkku's-Toys

.github/workflows/publish.yml

@@ -41,41 +41,36 @@ jobs:
     - name: Package client
       run: dotnet run --project Content.Packaging client --no-wipe-release
 
-    - name: Update Build Info
-      run: Tools/gen_build_info.py
-
-    - name: Shuffle files around
-      run: |
-        mkdir "release/${{ github.sha }}"
-        mv release/*.zip "release/${{ github.sha }}"
-
-    - name: Upload files to centcomm
-      uses: appleboy/scp-action@master
+    - name: Upload build artifact
+      id: artifact-upload-step
+      uses: actions/upload-artifact@v4
       with:
-        host: ${{ secrets.PUBLISH_HOST }}
-        username: ${{ secrets.PUBLISH_USER }}
-        key: ${{ secrets.PUBLISH_KEY }}
-        port: ${{ secrets.PUBLISH_PORT }}
-        source: "release/${{ github.sha }}"
-        target: "/var/www/builds.delta-v.org/delta-v/builds/"
-        strip_components: 1
+        name: build
+        path: release/*.zip
+        compression-level: 0
+        retention-days: 0
 
-    - name: Update manifest JSON
-      uses: appleboy/ssh-action@master
-      with:
-        host: ${{ secrets.PUBLISH_HOST }}
-        username: ${{ secrets.PUBLISH_USER }}
-        key: ${{ secrets.PUBLISH_KEY }}
-        port: ${{ secrets.PUBLISH_PORT }}
-        script: /home/deltav/publish/push.ps1 ${{ github.sha }}
+    - name: Publish version
+      run: Tools/publish_github_artifact.py
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        PUBLISH_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
+        ARTIFACT_ID: ${{ steps.artifact-upload-step.outputs.artifact-id }}
+        GITHUB_REPOSITORY: ${{ vars.GITHUB_REPOSITORY }}
 
     - name: Publish changelog (Discord)
       run: Tools/actions_changelogs_since_last_run.py
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        CHANGELOG_DIR: ${{ vars.CHANGELOG_DIR }}
         DISCORD_WEBHOOK_URL: ${{ secrets.CHANGELOG_DISCORD_WEBHOOK }}
 
     - name: Publish changelog (RSS)
       run: Tools/actions_changelog_rss.py
       env:
         CHANGELOG_RSS_KEY: ${{ secrets.CHANGELOG_RSS_KEY }}
+
+    - uses: geekyeggo/delete-artifact@v5
+      if: always()
+      with:
+        name: build

.github/workflows/test-packaging.yml

@@ -65,9 +65,6 @@ jobs:
       - name: Package client
         run: dotnet run --project Content.Packaging client --no-wipe-release
 
-      - name: Update Build Info
-        run: Tools/gen_build_info.py
-
       - name: Shuffle files around
         run: |
           mkdir "release/${{ github.sha }}"

Resources/Changelog/Floof.yml

@@ -129,3 +129,9 @@ Entries:
       message: Removed Mass-Mind-Swap Event.
   id: 18
   time: '2024-07-19T13:45:06.0000000+00:00'
+- author: FoxxoTrystan/Fansana
+  changes:
+    - type: Add
+      message: Set up the Floof CDN.
+  id: 19
+  time: '2024-07-19T13:45:06.0000000+00:00'

SpaceStation14.sln

@@ -62,7 +62,6 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{806ED41A-411B-4B3B-BEB6-DEC6DCA4C205}"
 	ProjectSection(SolutionItems) = preProject
 		Tools\generate_hashes.ps1 = Tools\generate_hashes.ps1
-		Tools\gen_build_info.py = Tools\gen_build_info.py
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Robust.Shared.Scripting", "RobustToolbox\Robust.Shared.Scripting\Robust.Shared.Scripting.csproj", "{41B450C0-A361-4CD7-8121-7072B8995CFC}"

Tools/publish_github_artifact.py

@@ -0,0 +1,56 @@
+#!/usr/bin/env python3
+
+import requests
+import os
+import subprocess
+
+GITHUB_TOKEN = os.environ["GITHUB_TOKEN"]
+PUBLISH_TOKEN = os.environ["PUBLISH_TOKEN"]
+ARTIFACT_ID = os.environ["ARTIFACT_ID"]
+GITHUB_REPOSITORY = os.environ["GITHUB_REPOSITORY"]
+VERSION = os.environ['GITHUB_SHA']
+
+#
+# CONFIGURATION PARAMETERS
+# Forks should change these to publish to their own infrastructure.
+#
+ROBUST_CDN_URL = "http://floofstation.com:27690/"
+FORK_ID = "floofstation-main"
+
+def main():
+    print("Fetching artifact URL from API...")
+    artifact_url = get_artifact_url()
+    print(f"Artifact URL is {artifact_url}, publishing to Robust.Cdn")
+
+    data = {
+        "version": VERSION,
+        "engineVersion": get_engine_version(),
+        "archive": artifact_url
+    }
+    headers = {
+        "Authorization": f"Bearer {PUBLISH_TOKEN}",
+        "Content-Type": "application/json"
+    }
+    resp = requests.post(f"{ROBUST_CDN_URL}fork/{FORK_ID}/publish", json=data, headers=headers)
+    resp.raise_for_status()
+    print("Publish succeeded!")
+
+def get_artifact_url() -> str:
+    headers = {
+        "Authorization": f"Bearer {GITHUB_TOKEN}",
+        "X-GitHub-Api-Version": "2022-11-28"
+    }
+    resp = requests.get(f"https://api.github.com/repos/{GITHUB_REPOSITORY}/actions/artifacts/{ARTIFACT_ID}/zip", allow_redirects=False, headers=headers)
+    resp.raise_for_status()
+
+    return resp.headers["Location"]
+
+def get_engine_version() -> str:
+    proc = subprocess.run(["git", "describe","--tags", "--abbrev=0"], stdout=subprocess.PIPE, cwd="RobustToolbox", check=True, encoding="UTF-8")
+    tag = proc.stdout.strip()
+    assert tag.startswith("v")
+    return tag[1:] # Cut off v prefix.
+
+
+if __name__ == '__main__':
+    main()