Merge branch 'master' into opengl-es-renderer

Aleph-One-Marathon · Sep 4, 2024 · a717797 · a717797
2 parents 41fa29b + f54650b
commit a717797
Show file tree

Hide file tree

Showing 72 changed files with 5,175 additions and 2,867 deletions.
diff --git a/.github/workflows/release-standalone-hub.yml b/.github/workflows/release-standalone-hub.yml
@@ -4,22 +4,33 @@ on: [workflow_dispatch, workflow_call]
 
 jobs:
   release-standalone-hub:
+    permissions:
+      packages: write
     runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v4
 
     - name: Get Standalone Hub Version
       run: echo "standalone_hub_version=$(awk -F'"' '/#define STANDALONE_HUB_VERSION/ {print $2}' Source_Files/Network/StandaloneHub/StandaloneHub.h)" >> $GITHUB_ENV
-
+
+    - name: Get Repository Owner 
+      run: echo "repository_owner=${GITHUB_REPOSITORY_OWNER@L}" >> "${GITHUB_ENV}"
+
     - name: Build Docker image
       run: docker buildx build -t alephone/standalone-hub:${{env.standalone_hub_version}} . -f Dockerfile.hub --load
 
     - name: Save Docker image
       run: docker save -o alephone-standalone-hub-${{env.standalone_hub_version}}.tar alephone/standalone-hub:${{env.standalone_hub_version}}
-        
+
     - name: Upload
       uses: actions/upload-artifact@v4
       with:
         name: alephone-standalone-hub
         if-no-files-found: error
-        path: alephone-standalone-hub-${{env.standalone_hub_version}}.tar
+        path: alephone-standalone-hub-${{env.standalone_hub_version}}.tar
+
+    - name: Push to Github Container Registry
+      run: |
+        echo ${{ github.token }} | docker login --username ${{ github.actor }} --password-stdin ghcr.io
+        docker tag alephone/standalone-hub:${{env.standalone_hub_version}} ghcr.io/${{env.repository_owner}}/standalone-hub:${{env.standalone_hub_version}}
+        docker push ghcr.io/${{env.repository_owner}}/standalone-hub:${{env.standalone_hub_version}}
diff --git a/.github/workflows/release-steam-mac-os.yml b/.github/workflows/release-steam-mac-os.yml
@@ -11,7 +11,7 @@ jobs:
     - name: Build Steam Marathon
       uses: ./.github/actions/build-mac-osx
       with:
-        xcode_targets: "Marathon Steam, Marathon 2 Steam, Classic Marathon Launcher"
+        xcode_targets: "Marathon Steam, Marathon 2 Steam, Marathon Infinity Steam, Classic Marathon Launcher"
 
     - name: Bootstrap Steamcmd
       continue-on-error: true #Steamcmd may throw error exit code while bootstrapping that we can ignore, we will see on upload if everything is working fine
@@ -53,6 +53,7 @@ jobs:
         /usr/bin/codesign --force -s "$MACOS_CERTIFICATE_NAME" --entitlements "$GITHUB_WORKSPACE/PBProjects/Steamshim.entitlements" --options runtime "$GITHUB_WORKSPACE/PBProjects/build/Release/Classic Marathon Launcher" -v
         /usr/bin/codesign --force -s "$MACOS_CERTIFICATE_NAME" --options runtime "$GITHUB_WORKSPACE/PBProjects/build/Release/Classic Marathon Steam.app" -v
         /usr/bin/codesign --force -s "$MACOS_CERTIFICATE_NAME" --options runtime "$GITHUB_WORKSPACE/PBProjects/build/Release/Classic Marathon 2 Steam.app" -v
+        /usr/bin/codesign --force -s "$MACOS_CERTIFICATE_NAME" --options runtime "$GITHUB_WORKSPACE/PBProjects/build/Release/Classic Marathon Infinity Steam.app" -v
 
     - name: "Notarize app bundle"
       # Extract the secrets we defined earlier as environment variables
@@ -74,6 +75,7 @@ jobs:
         echo "Creating temp notarization archives"
         ditto -c -k --keepParent "$GITHUB_WORKSPACE/PBProjects/build/Release/Classic Marathon Steam.app" "marathon.zip"
         ditto -c -k --keepParent "$GITHUB_WORKSPACE/PBProjects/build/Release/Classic Marathon 2 Steam.app" "marathon2.zip"
+        ditto -c -k --keepParent "$GITHUB_WORKSPACE/PBProjects/build/Release/Classic Marathon Infinity Steam.app" "infinity.zip"
         ditto -c -k --keepParent "$GITHUB_WORKSPACE/PBProjects/build/Release/Classic Marathon Launcher" "launcher.zip"       
 
         # Here we send the notarization request to the Apple's Notarization service, waiting for the result.
@@ -97,5 +99,10 @@ jobs:
         echo "Attach staple"
         xcrun stapler staple "$GITHUB_WORKSPACE/PBProjects/build/Release/Classic Marathon 2 Steam.app"
 
+        echo "Notarize Classic Marathon Infinity Steam"
+        xcrun notarytool submit "infinity.zip" --keychain-profile "notarytool-profile" --wait
+        echo "Attach staple"
+        xcrun stapler staple "$GITHUB_WORKSPACE/PBProjects/build/Release/Classic Marathon Infinity Steam.app"
+
     - name: Deploy to Steam
-      run: ./Steam/steamcmd/steamcmd.sh +login alephone_upload +run_app_build ../m1_mac.vdf +run_app_build ../m2_mac.vdf +quit
+      run: ./Steam/steamcmd/steamcmd.sh +login alephone_upload +run_app_build ../m1_mac.vdf +run_app_build ../m2_mac.vdf +run_app_build ../inf_mac.vdf +quit
diff --git a/.github/workflows/release-steam-windows.yml b/.github/workflows/release-steam-windows.yml
@@ -14,7 +14,7 @@ jobs:
       uses: ./.github/actions/build-windows
       with:
         platform: x64
-        configurations: "Steam Marathon, Steam Marathon 2"
+        configurations: "Steam Marathon, Steam Marathon 2, Steam Marathon Infinity"
         vcpkg_installed_folder: installed-x64-windows
 
     - name: Bootstrap Steamcmd
@@ -30,4 +30,4 @@ jobs:
       shell: bash
 
     - name: Deploy to Steam
-      run: ./Steam/steamcmd/steamcmd.exe +login alephone_upload +run_app_build ../m1_build.vdf +run_app_build ../m2_build.vdf +quit
+      run: ./Steam/steamcmd/steamcmd.exe +login alephone_upload +run_app_build ../m1_build.vdf +run_app_build ../m2_build.vdf +run_app_build ../inf_build.vdf +quit