Update workflows for package release and merge

The 'release.yml' and 'merge.yml' workflow files have been reconfigured for a more comprehensive release process. In 'release.yml', new steps have been added for fetching latest release, restoring and building solution, running tests, and pushing NuGet packages. Redundant steps have been removed from 'merge.yml' to avoid redundancy.
frankhaugen · Jul 19, 2024 · 7286497 · 7286497
1 parent 295eecf
commit 7286497
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 12 deletions.
diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
@@ -20,9 +20,6 @@ jobs:
         with:
           token: ${{ github.token }}
 
-      - name: Output latest release
-        run: echo "Latest release is ${{ steps.get_release.outputs.tag }}.${{ github.run_number }}"
-
       - name: Restore NuGet Packages
         run: dotnet restore
 
@@ -36,7 +33,4 @@ jobs:
         run: dotnet pack --no-build --configuration Release --output nupkgs /p:Version=${{ steps.get_release.outputs.tag }}-preview
 
       - name: Push NuGet Packages
-        run: dotnet nuget push nupkgs/*.nupkg  -k ${{ secrets.nugetkey }} -s https://api.nuget.org/v3/index.json --skip-duplicate
-
-
-
+        run: dotnet nuget push **/*.nupkg  -k ${{ secrets.nugetkey }} -s https://api.nuget.org/v3/index.json --skip-duplicate
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,8 +9,44 @@ jobs:
   release_job:
     name: Release Job
     if: github.event_name == 'release' || github.event_name == 'workflow_dispatch'
-    uses: frankhaugen/Workflows/.github/workflows/dotnet-publish-release.yml@main
-    with:
-      os: 'windows-latest'
-    secrets: inherit
-
+    runs-on: windows-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+
+      - name: Get latest release
+        id: get_release
+        uses: frankhaugen/Workflows/.github/actions/github-latest-release@main
+        with:
+          token: ${{ github.token }}
+
+      - name: Restore NuGet Packages
+        run: dotnet restore
+
+      - name: Build Solution
+        run: dotnet build --configuration Release --no-restore /p:Version=${{ steps.get_release.outputs.tag }}.${{ github.run_number }}
+
+      - name: Run Tests
+        run: dotnet test --no-build --configuration Release --logger trx --results-directory TestResults
+
+      - name: Pack NuGet Packages
+        run: dotnet pack --no-build --configuration Release --output nupkgs /p:Version=${{ steps.get_release.outputs.tag }}
+
+      - name: Push NuGet Packages
+        run: dotnet nuget push **/*.nupkg  -k ${{ secrets.nugetkey }} -s https://api.nuget.org/v3/index.json --skip-duplicate
+
+      - name: Add GitHub NuGet Source
+        run: dotnet nuget add source --username ${{ github.repository_owner }} --password ${{ github.token }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json"
+
+      - name: Push NuGet Packages to GitHub
+        run: dotnet nuget push **/*.nupkg  -k ${{ github.token }} -s https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json --skip-duplicate
+
+      - name: Attach to GitHub Release
+        uses: xresloader/upload-to-github-release@v1
+        with:
+          file: '**/*.nupkg'
+          release_id: ${{ steps.get_release.outputs.id }}
+          overwrite: false
+          verbose: true
+        env:
+          GITHUB_TOKEN: ${{ github.token }}