Fix/release package workflow (#14)

Author: Invvard

.github/workflows/dotnet-ci.yaml

@@ -22,6 +22,6 @@ jobs:
   update_version:
     name: Update Version
     needs: build_and_test
+    uses: ./.github/workflows/wf-update-version.yaml
     permissions:
       contents: write
-    uses: ./.github/workflows/wf-update-version.yaml

.github/workflows/dotnet-merge-develop.yaml

@@ -2,9 +2,9 @@ name: .NET CI
 run-name: Continuous Integration
 
 on:
-    pull_request_target:
-      branches: ["develop"]
-      types: [closed]
+  pull_request_target:
+    branches: ["develop"]
+    types: [closed]
 
 concurrency:
   group: ci-${{ github.workflow }}-${{ github.actor_id }}
@@ -18,8 +18,10 @@ jobs:
     update_version:
       name: Update Version
       needs: build_and_test
+      uses: ./.github/workflows/wf-update-version.yaml
       permissions:
         contents: write
-      uses: ./.github/workflows/wf-update-version.yaml
       with:
-        bumpVersion: 0.^.0
+        bumpVersion: 0.^.0
+        userName: ${{ github.event.pull_request.user.login }}
+        userEmail: ${{ github.event.pull_request.user.email }}

.github/workflows/dotnet-prerelease-pack.yaml

@@ -1,10 +1,10 @@
-name: .Nuget Pre-release
-run-name: Create pre-release NuGet packages
+name: Package Pre-Release
+run-name: Pack & Publish pre-release NuGet packages
 
 on:
   workflow_dispatch:
     inputs:
-      push_package:
+      push_package_to_nuget:
         description: 'Push package to NuGet.org'
         type: boolean
         default: false
@@ -48,8 +48,10 @@ jobs:
     needs: [build_and_test, setup_env]
     name: Publish NuGet packages
     uses: ./.github/workflows/wf-publish-nuget.yaml
+    permissions:
+      packages: write
     with:
-      push_package: ${{ github.event.inputs.push_package }}
+      push_package_to_nuget: ${{ github.event.inputs.push_package_to_nuget == 'true' }}
       version_suffix: ${{ needs.setup_env.outputs.version_suffix }}
     secrets:
       nuget_api_key: ${{ secrets.NUGET_API_KEY_TEST }}

.github/workflows/dotnet-release.yaml

@@ -1,4 +1,4 @@
-name: .NET Release
+name: Package Release
 run-name: Release ${{ github.ref_name }}
 
 on:
@@ -14,7 +14,7 @@ jobs:
     if: github.event.release.draft == false
     uses: ./.github/workflows/wf-publish-nuget.yaml
     with:
-      push_package: ${{ github.event.release.prerelease == false }}
+      push_package_to_nuget: ${{ github.event.release.prerelease == false }}
     secrets:
       nuget_api_key: ${{ secrets.NUGET_API_KEY_TEST }}
 

.github/workflows/wf-publish-nuget.yaml

@@ -4,7 +4,7 @@ run-name: Publish NuGet Package
 on:
   workflow_call:
     inputs:
-      push_package:
+      push_package_to_nuget:
         type: boolean
         default: false
       build_configuration:
@@ -21,10 +21,12 @@ on:
         required: true
 
 env:
-  PACKAGE_PATH: nupkgs
+  PACKAGE_DIR_NAME: nupkgs
+  PACKAGE_OUTPUT_PATH: ${{ github.workspace }}/nupkgs
+  GITHUB_PACKAGE_SOURCE: "https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json"
 
 jobs:
-  prepare-package:
+  prepare_package:
     name: Prepare Package
     runs-on: ubuntu-latest
 
@@ -38,31 +40,45 @@ jobs:
         run: mkdir -p packages
 
       - name: Pack
-        run: dotnet pack $GITHUB_WORKSPACE/src/InvvardDev.Ifttt.csproj --output $PACKAGE_PATH --configuration ${{ inputs.build_configuration }} -p:GeneratePackageOnBuild=false
+        run: dotnet pack $GITHUB_WORKSPACE/src/InvvardDev.Ifttt.csproj --version-suffix '${{ inputs.version_suffix }}' --output $PACKAGE_DIR_NAME --configuration ${{ inputs.build_configuration }} -p:GeneratePackageOnBuild=false
 
       - name: Upload Artifact
         uses: actions/upload-artifact@v4
         with:
           name: nuget-packages
-          path: $PACKAGE_PATH
+          path: ${{ env.PACKAGE_OUTPUT_PATH }}
 
-  publish-to-nuget:
+  publish_to_nuget:
     name: Publish Package to NuGet
+    if: inputs.push_package_to_nuget
     runs-on: ubuntu-latest
+    needs: [prepare_package]
 
     steps:
+      - name: Download Artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: nuget-packages
+          path: ${{ env.PACKAGE_OUTPUT_PATH }}
+          
       - name: Publish to NuGet
-        if: inputs.push_package
-        run: dotnet nuget push $PACKAGE_PATH/*.* --api-key $api_key --source https://api.nuget.org/v3/index.json --skip-duplicate
+        run: dotnet nuget push ${{ env.PACKAGE_OUTPUT_PATH }}/*.* --api-key $api_key --source https://api.nuget.org/v3/index.json --skip-duplicate
         env:
           api_key: ${{ secrets.nuget_api_key }}
 
-  publish-to-github:
+  publish_to_github:
     name: Publish Package to GitHub Packages
     runs-on: ubuntu-latest
+    needs: [prepare_package]
 
     steps:
+      - name: Download Artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: nuget-packages
+          path: ${{ env.PACKAGE_OUTPUT_PATH }}
+          
       - name: Publish to GitHub Packages
-        run: dotnet nuget push ${{ env.package_path }}/*.* --api-key $api_key --source https://nuget.pkg.github.com/InvvardDev/index.json --skip-duplicate --no-symbols
+        run: dotnet nuget push ${{ env.PACKAGE_OUTPUT_PATH }}/*.* --api-key ${{ env.api_key }} --source ${{ env.GITHUB_PACKAGE_SOURCE }} --skip-duplicate --no-symbols
         env:
           api_key: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/wf-update-version.yaml

@@ -8,6 +8,14 @@ on:
         description: "The version to bump to"
         type: string
         default: bump-build
+      userName:
+        description: "The user name to use for the commit"
+        type: string
+        default: ${{ github.event.pusher.name }}
+      userEmail:
+        description: "The user email to use for the commit"
+        type: string
+        default: ${{ github.event.pusher.email }}
 
 jobs:
   update_version:
@@ -38,8 +46,8 @@ jobs:
 
       - name: Push new VersionPrefix
         run: |
-          git config user.name "${{github.event.pusher.name}}"
-          git config user.email "${{github.event.pusher.email}}"
+          git config user.name "${{inputs.userName}}"
+          git config user.email "${{inputs.userEmail}}"
           git add .
           git commit -m "Update Version Prefix from ${{ steps.bump_version_prefix.outputs.oldVersion }} to ${{ steps.bump_version_prefix.outputs.newVersion }}"
           git push