CI updates

Mutagen-Modding · Nov 22, 2024 · 1c6e975 · 1c6e975
1 parent ef7056a
commit 1c6e975
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 15 deletions.
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -4,15 +4,15 @@ on:
   push:
     branches:
       - dev
-      - release
+      - main
       - prerelease
     paths-ignore:
       - 'docs/**'
       - 'mkdocs.yml'
   pull_request:
     branches:
       - dev
-      - release
+      - main
       - prerelease
     paths-ignore:
       - 'docs/**'
@@ -24,21 +24,28 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - name: Setup .NET 8
+        with:
+          fetch-depth: 0
+      - name: Install GitVersion
+        uses: gittools/actions/gitversion/setup@v3.0.3
+        with:
+          versionSpec: '6.x'
+      - name: Determine Version
+        id: version_step # step id used as reference for output values
+        uses: gittools/actions/gitversion/execute@v3.0.3
+      - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.*
+          dotnet-version: 9.0.*
       - name: Clean dependencies
         run: |
           dotnet clean Mutagen.Bethesda.Serialization.sln -c Release
           dotnet clean Mutagen.Bethesda.Serialization.Tests.sln -c Release
           dotnet nuget locals all --clear
-      - name: Install dependencies for Main Solution
-        run: dotnet restore Mutagen.Bethesda.Serialization.sln
       - name: Build Main Solution
-        run: dotnet build Mutagen.Bethesda.Serialization.sln -c Release --no-restore
+        run: dotnet build Mutagen.Bethesda.Serialization.sln -c Release -p:GitVersion_NuGetVersion=${{ steps.version_step.outputs.fullSemVer }}
       - name: Test Main Solution
-        run: dotnet test Mutagen.Bethesda.Serialization.sln -c Release --no-build
+        run: dotnet test Mutagen.Bethesda.Serialization.sln -c Release --no-build -p:GitVersion_NuGetVersion=${{ steps.version_step.outputs.fullSemVer }}
       - name: Add results to local nuget cache
         run: |
           workingDir="$(cd "$(dirname "./")"; pwd)/$(basename "./")"
@@ -51,9 +58,7 @@ jobs:
           dotnet nuget enable source CISourceGenerator
           dotnet nuget add source "${workingDir}/Mutagen.Bethesda.Serialization.Yaml/bin/Release" --name CIYaml
           dotnet nuget enable source CIYaml
-      - name: Install dependencies for Test Solution
-        run: dotnet restore Mutagen.Bethesda.Serialization.Tests.sln
       - name: Build Test Solution
-        run: dotnet build Mutagen.Bethesda.Serialization.Tests.sln -c Release --no-restore /p:GeneratePackageOnBuild=false
+        run: dotnet build Mutagen.Bethesda.Serialization.Tests.sln -c Release /p:GeneratePackageOnBuild=false -p:GitVersion_NuGetVersion=${{ steps.version_step.outputs.fullSemVer }}
       - name: Test Test Solution
-        run: dotnet test Mutagen.Bethesda.Serialization.Tests.sln -c Release --no-build
+        run: dotnet test Mutagen.Bethesda.Serialization.Tests.sln -c Release --no-build -p:GitVersion_NuGetVersion=${{ steps.version_step.outputs.fullSemVer }}
diff --git a/.github/workflows/ci-publish.yml b/.github/workflows/ci-publish.yml
@@ -46,10 +46,12 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - name: Setup .NET 8
+        with:
+          fetch-depth: 0
+      - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.*
+          dotnet-version: 9.0.*
       - name: Clean dependencies
         run: |
           dotnet clean Mutagen.Bethesda.Serialization.sln -c Release
@@ -125,7 +127,7 @@ jobs:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0
-    - name: Reset nightly to master
+    - name: Reset nightly to main
       run: |
         head_sha=$(git rev-parse --verify HEAD)
         echo "head_sha=$head_sha"