Merge pull request #33 from EvaisaDev/publish-attempt-one

Lordfirespeed · web-flow · commit 8a07ffdcdd87 · 2024-03-10T14:48:59.000Z
Publish attempt one
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -136,7 +136,7 @@ jobs:
       - name: Upload patcher archive artifact
         uses: actions/upload-artifact@v4
         with:
-          name: patcher-archive-build
+          name: patcher-zip-build
           path: "./patchers.zip"
 
   build-cli-binaries:
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -8,16 +8,35 @@ jobs:
   grab-reference-assemblies:
     name: Get reference assemblies from Unity
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        unity-version: [ "2022.3.9" ]
+        transport-version: [ "1.0.0", "2.2.1" ]
+        include:
+          - unity-version: "2022.3.9"
+            unity-version-revision: "f1"
     steps:
       - name: Fetch Sources
         uses: actions/checkout@v4
 
+      - name: Set Unity version
+        run: |
+          echo "m_EditorVersion: ${{ matrix.unity-version }}${{ matrix.unity-version-revision }}" > UnityProject/ProjectSettings/ProjectVersion.txt
+
+      - name: Set Transport version
+        run: |
+          tmp=$(mktemp)
+          jq '.dependencies["com.unity.transport"] = "${{ matrix.transport-version }}"' UnityProject/Packages/manifest.json > "$tmp"
+          mv "$tmp" UnityProject/Packages/manifest.json
+
       - name: Cache Unity project
         uses: actions/cache@v4
         with:
           path: ./UnityProject/Library
-          key: Library-UnityNetcodePatcher-linux-x64
+          key: Library-UnityNetcodePatcher-uv${{ matrix.unity-version }}-tv${{ matrix.transport-version }}-linux-x64
           restore-keys: |
+            Library-UnityNetcodePatcher-uv${{ matrix.unity-version }}-tv${{ matrix.transport-version }}-
+            Library-UnityNetcodePatcher-uv${{ matrix.unity-version }}-
             Library-UnityNetcodePatcher-
             Library-
 
@@ -28,6 +47,7 @@ jobs:
           UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
           UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
         with:
+          allowDirtyBuild: true
           projectPath: ./UnityProject
           targetPlatform: StandaloneLinux64
           buildMethod: UnityBuilderAction.RestoreScript.Restore
@@ -42,7 +62,7 @@ jobs:
       - name: Upload assemblies as build artifact
         uses: actions/upload-artifact@v4
         with:
-          name: reference-assemblies
+          name: reference-assemblies-uv${{ matrix.unity-version }}-tv${{ matrix.transport-version }}
           path: |
             UnityProject/Library/ScriptAssemblies/
             UnityProject/UnityEditor/
@@ -54,7 +74,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        unity-version: [ "2022.3.9" ]
         netcode-version: [ "1.5.2", "1.6.0", "1.7.0", "1.7.1", "1.8.0", "1.8.1" ]
+        transport-version: [ "1.0.0", "2.2.1" ]
+        native-collection-support: [ true, false ]
     steps:
       - name: Fetch Sources
         uses: actions/checkout@v4
@@ -66,7 +89,7 @@ jobs:
       - name: Fetch Reference Assemblies
         uses: actions/download-artifact@v4
         with:
-          name: reference-assemblies
+          name: reference-assemblies-uv${{ matrix.unity-version }}-tv${{ matrix.transport-version }}
           path: UnityProject/
 
       - uses: actions/setup-dotnet@v4
@@ -76,24 +99,42 @@ jobs:
       - name: Build patcher
         shell: bash
         run: |
-          dotnet publish NetcodePatcher/NetcodePatcher.csproj -c Release -p:UnityNetcodeVersion="${{ matrix.netcode-version }}" -p:UnityEditorDir="${{ github.workspace }}/UnityProject/UnityEditor"
+          cd NetcodePatcher.Build
+          ./build.sh --unity-version ${{ matrix.unity-version }} --netcode-version ${{ matrix.netcode-version }} --transport-version ${{ matrix.transport-version }} --native-collection-support ${{ matrix.native-collection-support }} --unity-editor-dir "${{ github.workspace }}/UnityProject/UnityEditor"
 
       - name: Upload assembly artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: nv${{ matrix.netcode-version }}-patcher-assemblies
-          path: "./NetcodePatcher/bin/Release/netstandard2.1/publish/**/*"
+          name: uv${{ matrix.unity-version }}-nv${{ matrix.netcode-version }}-tv${{ matrix.transport-version }}-ncs-${{ matrix.native-collection-support }}-patcher-assemblies
+          path: "./NetcodePatcher/dist/**/*"
 
-      - name: Pack patcher
-        shell: bash
-        run: |
-          dotnet pack NetcodePatcher/NetcodePatcher.csproj -c Release -p:UnityNetcodeVersion="${{ matrix.netcode-version }}" -p:UnityEditorDir="${{ github.workspace }}/UnityProject/UnityEditor"
+  build-patcher-archive:
+    name: Build patcher archive
+    needs: build-patchers
+    runs-on: ubuntu-latest
+    steps:
+      - name: Fetch Sources
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          filter: tree:0
+          submodules: recursive
+
+      - name: Fetch Patcher Assemblies
+        uses: actions/download-artifact@v4
+        with:
+          pattern: "*-patcher-assemblies"
+          merge-multiple: true
+          path: ./patchers
+
+      - name: Create Patcher Archive
+        run: zip -r patchers.zip patchers
 
-      - name: Upload nupkg artifacts
+      - name: Upload patcher archive artifact
         uses: actions/upload-artifact@v4
         with:
-          name: nv${{ matrix.netcode-version }}-patcher-nupkg-build
-          path: "./NetcodePatcher/bin/Release/*.nupkg"
+          name: patcher-zip-build
+          path: "./patchers.zip"
 
   build-cli-binaries:
     name: Build CLI for ${{ matrix.target }}
@@ -124,9 +165,9 @@ jobs:
       - name: Fetch Patcher Assemblies
         uses: actions/download-artifact@v4
         with:
-          pattern: nv*-patcher-assemblies
+          pattern: "*-patcher-assemblies"
           merge-multiple: true
-          path: ./NetcodePatcher/bin/Release/netstandard2.1/publish
+          path: ./NetcodePatcher/dist
 
       - uses: actions/setup-dotnet@v4
         with:
@@ -158,9 +199,9 @@ jobs:
       - name: Fetch Patcher Assemblies
         uses: actions/download-artifact@v4
         with:
-          pattern: nv*-patcher-assemblies
+          pattern: "*-patcher-assemblies"
           merge-multiple: true
-          path: ./NetcodePatcher/bin/Release/netstandard2.1/publish
+          path: ./NetcodePatcher/dist
 
       - uses: actions/setup-dotnet@v4
         with:
@@ -192,9 +233,9 @@ jobs:
       - name: Fetch Patcher Assemblies
         uses: actions/download-artifact@v4
         with:
-          pattern: nv*-patcher-assemblies
+          pattern: "*-patcher-assemblies"
           merge-multiple: true
-          path: ./NetcodePatcher/bin/Release/netstandard2.1/publish
+          path: ./NetcodePatcher/dist
 
       - uses: actions/setup-dotnet@v4
         with:
diff --git a/NetcodePatcher.Tools.Common/PatcherConfiguration.cs b/NetcodePatcher.Tools.Common/PatcherConfiguration.cs
@@ -1,4 +1,5 @@
 using System;
+using System.IO;
 
 namespace NetcodePatcher.Tools.Common;
 
@@ -9,7 +10,11 @@ public record PatcherConfiguration()
     public required Version TransportVersion { get; init; }
     public required bool NativeCollectionSupport { get; init; }
 
-    public string PatcherAssemblyFileName => $"NetcodePatcher.uv{UnityVersion.Major}.{UnityVersion.Minor}.nv{NetcodeVersion}.tv{TransportVersion}.{(NativeCollectionSupport ? "withNativeCollectionSupport" : "withoutNativeCollectionSupport")}.dll";
+    public string PatcherAssemblyFileName => Path.Combine(
+        $"uv{UnityVersion.Major}.{UnityVersion.Minor}",
+        $"tv{TransportVersion}",
+        $"NetcodePatcher.uv{UnityVersion.Major}.{UnityVersion.Minor}.nv{NetcodeVersion}.tv{TransportVersion}.{(NativeCollectionSupport ? "withNativeCollectionSupport" : "withoutNativeCollectionSupport")}.dll"
+    );
 
     public override string ToString()
     {
