Fixed GitHub Actions setup.

Author: AraHaan

.github/mergify.yml

@@ -1,3 +1,16 @@
+queue_rules:
+  - name: default
+    conditions:
+      - -conflict # skip PRs with conflicts
+      - -draft # filter-out GH draft PRs
+      - -closed # filter-out closed GH PRs
+      - base=main
+      - label=automerge
+      - check-success=build
+      - check-success=Codacy Static Code Analysis
+      - check-success=DCO
+      - check-success=WIP
+
 pull_request_rules:
   # for check failures / WIP pending check.
   - name: Add enhancement label
@@ -16,8 +29,9 @@ pull_request_rules:
       - check-success=Codacy Security Scan
       - -draft
       - -closed
+      - -conflict
       - -label=automerge
-      - author~=^(AraHaan|CatGirlsAreLife|JunichiSama|xioke|Elskom-gitsync|dependabot(|-preview)\[bot\])$
+      - author~=^(AraHaan|CatGirlsAreLife|JunichiSama|xioke|Elskom-gitsync)$
     actions:
       label:
         add:
@@ -64,6 +78,15 @@ pull_request_rules:
       comment:
         message: This PR is WIP, when you complete the work remember to unset the WIP state in the title of this PR.
 
+  - name: Automatic message on conflict
+    conditions:
+      - -draft
+      - conflict
+    actions:
+      comment:
+        message: |
+          This PR is conflicted :sob:.
+
   - name: Automatic merge when automerge label added
     conditions:
       - -conflict # skip PRs with conflicts
@@ -86,10 +109,11 @@ pull_request_rules:
       review:
         type: APPROVE
         message: Automatically approving since automerge label was found.
-      merge:
-        strict: smart+fasttrack
-        strict_method: rebase
+      queue:
+        name: default
         method: squash
+        update_method: rebase
+        commit_message: default
 
   - name: Remove automerge label
     conditions:

.github/workflows/codacy-analysis.yml

@@ -18,21 +18,22 @@ jobs:
   codacy-security-scan:
     name: Codacy Security Scan
     runs-on: ubuntu-latest
+    env:
+      DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
+      DOTNET_CLI_TELEMETRY_OPTOUT: true
+      DOTNET_NOLOGO: true
+      BUILD_RERUN_COUNT: ${{ github.run_attempt }}
     steps:
       # Checkout the repository to the GitHub Actions runner
       - name: Checkout code
         uses: actions/checkout@main
 
-      - name: .NET core build
-        uses: actions/setup-dotnet@main
-        with:
-          dotnet-version: '6.0.x'
-          include-prerelease: true
+      - name: Install latest .NET SDK
+        uses: Elskom/setup-latest-dotnet@main
 
-      - name: Restore, Build, test, and pack
+      - name: Restore, Build, and test
         uses: Elskom/build-dotnet@main
         with:
-          SOLUTION_FILE_PATH: GitBuildInfo.SourceGenerator.sln
           TEST: true
           PACK: false
 

.github/workflows/dotnetcore-build.yml

@@ -11,16 +11,14 @@ jobs:
       DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
       DOTNET_CLI_TELEMETRY_OPTOUT: true
       DOTNET_NOLOGO: true
+      BUILD_RERUN_COUNT: ${{ github.run_attempt }}
     steps:
     - uses: actions/checkout@main
-    - name: .NET core build
-      uses: actions/setup-dotnet@main
-      with:
-        dotnet-version: '6.0.x'
-        include-prerelease: true
+
+    - name: Install latest .NET SDK
+      uses: Elskom/setup-latest-dotnet@main
 
     - name: Restore, Build, test, and pack
       uses: Elskom/build-dotnet@main
       with:
-        SOLUTION_FILE_PATH: GitBuildInfo.SourceGenerator.sln
         TEST: true

.github/workflows/dotnetcore-publish.yml

@@ -12,29 +12,16 @@ jobs:
       DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
       DOTNET_CLI_TELEMETRY_OPTOUT: true
       DOTNET_NOLOGO: true
+      NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
+      BUILD_RERUN_COUNT: ${{ github.run_attempt }}
     steps:
     - uses: actions/checkout@main
-    - name: .NET core build
-      uses: actions/setup-dotnet@main
-      with:
-        dotnet-version: '6.0.x'
-        include-prerelease: true
+
+    - name: Install latest .NET SDK
+      uses: Elskom/setup-latest-dotnet@main
 
     - name: Restore, Build, test, and pack
       uses: Elskom/build-dotnet@main
       with:
-        SOLUTION_FILE_PATH: GitBuildInfo.SourceGenerator.sln
         TEST: true
-
-    - name: Publish Release
-      id: publish_nuget
-      uses: Elskom/publish-nuget@main
-      with:
-        # Filepath of the project to be packaged, relative to root of repository
-        PROJECT_FILE_PATH: '**/*.csproj'
-        # Path to store all generated nuget packages, relative to root of repository
-        PACKAGE_PATH: artifacts/
-        # Flag to toggle git tagging, enabled by default
-        TAG_COMMIT: false
-        # API key to authenticate with NuGet server
-        NUGET_KEY: ${{ secrets.NUGET_API_KEY }}
+        PUSH: true