Fixed workflows

LavaGang · Oct 13, 2024 · c39861a · c39861a
1 parent da91201
commit c39861a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,5 +1,5 @@
 name: Build MelonLoader
-run-name: ${{ vars.DEVVERSION }}.${{ github.run_number }} | ${{ github.event.head_commit.message }}
+run-name: ${{ vars.DEVVERSION }}${{ github.event_name != 'workflow_dispatch' && format('-ci.{0}', github.run_number) || '' }} | ${{ github.event_name != 'workflow_dispatch' && github.event.head_commit.message || 'Manual Build' }}
 
 on:
   push:
@@ -17,7 +17,7 @@ jobs:
         uses: microsoft/setup-msbuild@v2
       - name: Build Melonloader Core
         shell: cmd
-        run: msbuild /restore /p:Platform="Windows - x64" /p:Version="${{ vars.DEVVERSION }}.${{ github.run_number }}" # Platform is actually irrelevant for core, it's compiled as AnyCPU either way
+        run: msbuild /restore /p:Platform="Windows - x64" /p:Version="${{ vars.DEVVERSION }}${{ github.event_name != 'workflow_dispatch' && format('.{0}', github.run_number) || '' }}" # Platform is actually irrelevant for core, it's compiled as AnyCPU either way
       - name: Upload core artifact
         uses: actions/upload-artifact@v4
         with:
@@ -31,7 +31,7 @@ jobs:
         uses: microsoft/setup-msbuild@v2
       - name: Build Melonloader Core
         shell: cmd
-        run: msbuild /restore /p:Configuration=Release /p:Platform="Windows - x64" /p:Version="${{ vars.DEVVERSION }}.${{ github.run_number }}"
+        run: msbuild /restore /p:Configuration=Release /p:Platform="Windows - x64" /p:Version="${{ vars.DEVVERSION }}${{ github.event_name != 'workflow_dispatch' && format('.{0}', github.run_number) || '' }}"
       - name: Upload core artifact
         uses: actions/upload-artifact@v4
         with:

diff --git a/.github/workflows/nuget.yml b/.github/workflows/nuget.yml
@@ -1,5 +1,5 @@
 name: Build NuGet Package
-run-name: ${{ vars.DEVVERSION }}.${{ github.run_number }} | ${{ github.event.head_commit.message }}
+run-name: ${{ vars.DEVVERSION }}${{ github.event_name != 'workflow_dispatch' && format('-ci.{0}', github.run_number) || '' }} | ${{ github.event_name != 'workflow_dispatch' && github.event.head_commit.message || 'Manual Build' }}
 
 on:
   push:
@@ -18,10 +18,10 @@ jobs:
         with:
           dotnet-version: 7.0.x
       - name: .NET Pack
-        run: dotnet pack -c Release -p:Version="${{ vars.DEVVERSION }}.${{ github.run_number }}"
+        run: dotnet pack -c Release ${{ github.event_name != 'workflow_dispatch' && format('-p:Version="{0}-ci.{1}" -p:AssemblyVersion="{0}.{1}"', vars.DEVVERSION, github.run_number) || format('-p:Version="{0}"', vars.DEVVERSION) }}
         working-directory: ./MelonLoader/
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
           name: MelonLoaderNuGetPackage
-          path: MelonLoader/Output/Release/MelonLoader/LavaGang.MelonLoader.${{ vars.DEVVERSION }}.${{ github.run_number }}.nupkg
+          path: MelonLoader/Output/Release/MelonLoader/LavaGang.MelonLoader.${{ vars.DEVVERSION }}${{ github.event_name != 'workflow_dispatch' && format('-ci.{0}', github.run_number) || '' }}.nupkg