Merge main into develop after the creation of release v2.6.1

Author: actions-user

.github/workflows/GitFlow_Make-Release-and-Sync-to-Dev.yml

@@ -31,6 +31,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
+          token: ${{ secrets.GH_PAT_SYNC }}
           lfs: "true"
           fetch-depth: 0
 

.github/workflows/GitFlow_Nightly-builds.yml

@@ -40,33 +40,41 @@ jobs:
         id: check_prs
         shell: powershell
         run: |
-          # Get the latest release of any type
+          # Get the latest release tag (any type)
           $LATEST_TAG = git tag -l --sort=-version:refname | Select-Object -First 1
           Write-Host "Latest release: $LATEST_TAG"
-
-          # Get merged PRs since last tag using Git directly
-          $MERGED_PRS = git log --merges --grep="Merge pull request" --oneline "$LATEST_TAG..${{ env.BRANCH }}"
-
-          # If merged PRs exist, set BUILD_NEEDED and determine release type
-          if ($MERGED_PRS) {
-            Write-Host "Found PRs merged to develop since latest tag:"
-            Write-Host $MERGED_PRS
-            echo "BUILD_NEEDED=true" >> $env:GITHUB_OUTPUT
-
-            # Determine release type
-            if ($LATEST_TAG -like "*-*") {
-              $RELEASE_TYPE = "prerelease"
-            }
-            else {
-              $RELEASE_TYPE = "preminor"
-            }
-            echo "RELEASE_TYPE=$RELEASE_TYPE" >> $env:GITHUB_OUTPUT
-            Write-Host "Next release: $RELEASE_TYPE"
-          } else {
-            # If no merged PRs, skip building
-            Write-Host "No PRs merged to ${{ env.BRANCH }} since latest tag. Skipping build."
-            echo "BUILD_NEEDED=false" >> $env:GITHUB_OUTPUT
+          
+          # Get all merged PRs since last tag (only merge commits from PRs)
+          $MERGED_PRS = git log --merges --grep="Merge pull request" --pretty=format:"%h %s" "$LATEST_TAG..develop"
+          
+          # Count merges
+          $MERGE_COUNT = ($MERGED_PRS | Measure-Object).Count
+          
+          if ($MERGE_COUNT -eq 0) {
+              Write-Host "No PRs merged to develop since last tag. Skipping build."
+              $BUILD_NEEDED = $false
+          }
+          else {
+              Write-Host "Merged PRs since last tag (develop):"
+              Write-Host $MERGED_PRS
+          
+              if ($MERGE_COUNT -eq 1 -and $MERGED_PRS -match "Merge pull request #\d+ from .*/release/") {
+                  Write-Host "Only change since last tag is a release PR merge. Skipping build."
+                  $BUILD_NEEDED = $false
+              }
+              else {
+                  $BUILD_NEEDED = $true
+          
+                  # Set release type for output (adapts to your previous logic if you need it)
+                  if ($LATEST_TAG -like "*-*") {
+                      $RELEASE_TYPE = "prerelease"
+                  } else {
+                      $RELEASE_TYPE = "preminor"
+                  }
+                  echo "RELEASE_TYPE=$RELEASE_TYPE" >> $env:GITHUB_OUTPUT
+              }
           }
+          echo "BUILD_NEEDED=$BUILD_NEEDED" >> $env:GITHUB_OUTPUT
 
       # Step 3: Generate new semantic version number
       - name: Auto Increment Semver Action

Sources/Wix/build.wxs

@@ -262,7 +262,7 @@
         <SetProperty Id="AZUREBLOBURL_VALUE" After="AppSearch" Value="[AZUREBLOBURL]" Condition="AZUREBLOBURL" />
         <SetProperty Id="DONOTRUNONMETERED_VALUE" After="AppSearch" Value="#[DONOTRUNONMETERED]" Condition="DONOTRUNONMETERED" />
         <SetProperty Id="UPDATESATTIME_VALUE" After="AppSearch" Value="[UPDATESATTIME]" Condition="UPDATESATTIME" />
-        <SetProperty Id="UPDATESATTIMEDELAY_VALUE" After="AppSearch" Value="00:00" Condition="UPDATESATTIMEDELAY" />
+        <SetProperty Id="UPDATESATTIMEDELAY_VALUE" After="AppSearch" Value="[UPDATESATTIMEDELAY]" Condition="UPDATESATTIMEDELAY" />
         <SetProperty Id="BYPASSLISTFORUSERS_VALUE" After="AppSearch" Value="#[BYPASSLISTFORUSERS]" Condition="BYPASSLISTFORUSERS" />
         <SetProperty Id="MAXLOGFILES_VALUE" After="AppSearch" Value="#[MAXLOGFILES]" Condition="MAXLOGFILES" />
         <SetProperty Id="MAXLOGSIZE_VALUE" After="AppSearch" Value="#[MAXLOGSIZE]" Condition="MAXLOGSIZE" />