Merge pull request #726 from CommunityToolkit/ci/scheduled/tag-triggers

Use tag-based trigger for scheduled release build

Author: Arlodotexe

.github/workflows/build.yml

@@ -9,28 +9,13 @@ on:
   # Triggers the workflow on push or pull request events but only for the main branch
   push:
     branches: [ main ]
+    tags: [ 'release/weekly/*' ]
   pull_request:
     branches: [ main ]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
   merge_group:
-  
-  # Allow this workflow to be called as a reusable workflow
-  workflow_call:
-    inputs:
-      commit_range_start:
-        description: 'The start commit of the range to check for incremental builds.'
-        type: string
-        required: false
-      commit_range_end:
-        description: 'The end commit of the range to check for incremental builds.'
-        type: string
-        required: false
-      is_scheduled:
-        description: 'A boolean value that indicates whether this is a scheduled run.'
-        type: boolean
-        required: false
 
 env:
   DOTNET_VERSION: ${{ '9.0.x' }}
@@ -59,7 +44,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: recursive
-          ref: ${{ inputs.commit_range_end || github.sha }}
+          ref: ${{ github.sha }}
           fetch-depth: 0
           fetch-tags: true
 
@@ -100,13 +85,23 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: recursive
-          ref: ${{ inputs.commit_range_end || github.sha }}
+          ref: ${{ github.sha }}
           fetch-depth: 0
           fetch-tags: true
+
+      - name: Determine scheduled release commit range
+        if: ${{ startsWith(github.ref, 'refs/tags/') }}
+        id: range
+        shell: pwsh
+        run: |
+          # Previous weekly tag (2nd newest); fallback to main's HEAD
+          $prevTag = git tag --list 'release/weekly/*' --sort=-creatordate | Select-Object -Skip 1 -First 1
+          $tagSha = [string]::IsNullOrWhiteSpace($prevTag) ? (git rev-parse 'origin/main').Trim() : (git rev-list -n 1 $prevTag).Trim()
+          "PREV_TAG_COMMIT=$tagSha" >> $env:GITHUB_ENV
           
       - name: Get changed components
         run: |
-          $changedComponents = $(./tooling/Get-Changed-Components.ps1 ${{ inputs.commit_range_start || github.event.before }} ${{ inputs.commit_range_end || github.event.after }})
+          $changedComponents = $(./tooling/Get-Changed-Components.ps1 ${{ env.PREV_TAG_COMMIT || github.event.before }} ${{ github.sha || github.event.after }})
           $buildableChangedComponents = $(./tooling/MultiTarget/Filter-Supported-Components.ps1 -Components $changedComponents -MultiTargets ${{ matrix.multitarget }} -WinUIMajorVersion ${{ matrix.winui }})
           echo "CHANGED_COMPONENTS_LIST=$(($buildableChangedComponents | ForEach-Object { "$_" }) -join ',')" >> $env:GITHUB_ENV
           echo "HAS_BUILDABLE_COMPONENTS=$($buildableChangedComponents.Count -gt 0)" >> $env:GITHUB_ENV
@@ -266,7 +261,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: recursive
-          ref: ${{ inputs.commit_range_end || github.sha }}
+          ref: ${{ github.sha }}
           fetch-depth: 0
           fetch-tags: true
 
@@ -292,10 +287,20 @@ jobs:
         uses: microsoft/setup-msbuild@v2
         with:
           vs-version: '[17.9,)'
-            # Get changed components
+
+      - name: Determine scheduled release commit range
+        if: ${{ startsWith(github.ref, 'refs/tags/') }}
+        id: range
+        shell: pwsh
+        run: |
+          # Previous weekly tag (2nd newest); fallback to main's HEAD
+          $prevTag = git tag --list 'release/weekly/*' --sort=-creatordate | Select-Object -Skip 1 -First 1
+          $tagSha = [string]::IsNullOrWhiteSpace($prevTag) ? (git rev-parse 'origin/main').Trim() : (git rev-list -n 1 $prevTag).Trim()
+          "PREV_TAG_COMMIT=$tagSha" >> $env:GITHUB_ENV
+          
       - name: Get changed components
         run: |
-          $changedComponents = $(./tooling/Get-Changed-Components.ps1 ${{ inputs.commit_range_start || github.event.before }} ${{ inputs.commit_range_end || github.event.after }})
+          $changedComponents = $(./tooling/Get-Changed-Components.ps1 ${{ env.PREV_TAG_COMMIT || github.event.before }} ${{ github.event.after || github.sha }})
           $buildableChangedComponents = $(./tooling/MultiTarget/Filter-Supported-Components.ps1 -Components $changedComponents -MultiTargets "all" -WinUIMajorVersion ${{ matrix.winui }})
           echo "CHANGED_COMPONENTS_LIST=$(($buildableChangedComponents | ForEach-Object { "$_" }) -join ',')" >> $env:GITHUB_ENV
           echo "HAS_BUILDABLE_COMPONENTS=$($buildableChangedComponents.Count -gt 0)" >> $env:GITHUB_ENV
@@ -354,7 +359,7 @@ jobs:
 
   sign:
     needs: [package]
-    if: ${{ startsWith(github.ref, 'refs/heads/rel/') || inputs.is_scheduled }}
+    if: ${{ startsWith(github.ref, 'refs/heads/rel/') || startsWith(github.ref, 'refs/tags/') }}
     runs-on: windows-latest
     permissions:
       id-token: write # Required for requesting the JWT
@@ -411,15 +416,15 @@ jobs:
 
       - name: Upload Signed Packages as Artifacts (for release)
         uses: actions/upload-artifact@v4
-        if: ${{ startsWith(github.ref, 'refs/heads/rel/') || inputs.is_scheduled }}
+        if: ${{ startsWith(github.ref, 'refs/heads/rel/') || startsWith(github.ref, 'refs/tags/') }}
         with:
           name: signed-nuget-packages-${{ matrix.winui }}
           if-no-files-found: error
           path: |
             ${{ github.workspace }}/packages/**/*.nupkg
 
   release:
-    if: ${{ startsWith(github.ref, 'refs/heads/rel/') || inputs.is_scheduled }}
+    if: ${{ startsWith(github.ref, 'refs/heads/rel/') || startsWith(github.ref, 'refs/tags/') }}
     needs: [sign]
     environment: nuget-release-gate # This gates this job until manually approved
     runs-on: ubuntu-latest
@@ -469,7 +474,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: recursive
-          ref: ${{ inputs.commit_range_end || github.sha }}
+          ref: ${{ github.sha }}
           fetch-depth: 0
           fetch-tags: true
 

.github/workflows/scheduled-releases.yml

@@ -13,9 +13,6 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       contents: write
-    outputs:
-      commit_range_start: ${{ steps.range.outputs.commit_range_start }}
-      commit_range_end: ${{ steps.range.outputs.commit_range_end }}
 
     steps:
       - name: Checkout repository
@@ -37,36 +34,4 @@ jobs:
           TAG="release/weekly/$(date +%y%m%d)"
           git tag -a "$TAG" -m "Release $TAG"
           git push origin "$TAG"
-          echo "TAG=$TAG" >> $GITHUB_OUTPUT
-
-      - name: Determine commit range
-        id: range
-        run: |
-          # New tag we just created
-          NEW_TAG=${{ steps.create-tag.outputs.TAG }}
-
-          # Find the previous tag (sorted newest‑first)
-          PREV_TAG=$(git tag --list "release/weekly/*" --sort=-creatordate | sed -n '2p')
-
-          # If we’re on the very first tag, fall back to main
-          if [ -z "$PREV_TAG" ]; then
-            PREV_TAG=main
-          fi
-
-          # Resolve the commit hashes
-          START_COMMIT=$(git rev-parse "$PREV_TAG")
-          END_COMMIT=$(git rev-parse "$NEW_TAG")
-
-          # Export them as workflow outputs
-          echo "commit_range_start=$START_COMMIT" >> $GITHUB_OUTPUT
-          echo "commit_range_end=$END_COMMIT" >> $GITHUB_OUTPUT
-
-  # Then trigger the build workflow with the commit range.
-  trigger-build:
-    needs: tag-weekly-release
-    uses: ./.github/workflows/build.yml
-    with:
-      commit_range_start: ${{ needs.tag-weekly-release.outputs.commit_range_start }}
-      commit_range_end: ${{ needs.tag-weekly-release.outputs.commit_range_end }}
-      is_scheduled: true
-    secrets: inherit
+