From 953cd3a1073fc1c608326e192060f52dca24cbf5 Mon Sep 17 00:00:00 2001 From: Dongbo Wang Date: Fri, 13 Feb 2026 16:23:29 -0800 Subject: [PATCH] [release/v7.5] Fix template path for rebuild branch check in package.yml (#26818) --- .github/workflows/linux-ci.yml | 1 - .github/workflows/macos-ci.yml | 20 ++++++++++--------- .../templates/packaging/windows/package.yml | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml index b92b58fea5..773f565c60 100644 --- a/.github/workflows/linux-ci.yml +++ b/.github/workflows/linux-ci.yml @@ -233,7 +233,6 @@ jobs: - linux_test_elevated_others - linux_test_unelevated_ci - linux_test_unelevated_others - - analyze - linux_packaging - merge_conflict_check - infrastructure_tests diff --git a/.github/workflows/macos-ci.yml b/.github/workflows/macos-ci.yml index 89f3b7811d..e359623bbe 100644 --- a/.github/workflows/macos-ci.yml +++ b/.github/workflows/macos-ci.yml @@ -10,6 +10,8 @@ on: - github-mirror paths: - "**" + - "*" + - ".globalconfig" - "!.github/ISSUE_TEMPLATE/**" - "!.dependabot/config.yml" - "!.pipelines/**" @@ -23,12 +25,12 @@ on: # Path filters for PRs need to go into the changes job concurrency: - group: ${{ github.workflow }}-${{ github.ref }} + group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }} cancel-in-progress: ${{ contains(github.ref, 'merge')}} env: DOTNET_CLI_TELEMETRY_OPTOUT: 1 - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1 + DOTNET_NOLOGO: 1 FORCE_FEATURE: 'False' FORCE_PACKAGE: 'False' HOMEBREW_NO_ANALYTICS: 1 @@ -54,7 +56,7 @@ jobs: buildModuleChanged: ${{ steps.filter.outputs.buildModuleChanged }} steps: - name: checkout - uses: actions/checkout@v4.1.0 + uses: actions/checkout@v5 - name: Change Detection id: filter @@ -69,7 +71,7 @@ jobs: if: ${{ needs.changes.outputs.source == 'true' || needs.changes.outputs.buildModuleChanged == 'true' }} steps: - name: checkout - uses: actions/checkout@v4.1.0 + uses: actions/checkout@v5 with: fetch-depth: 1000 - name: Build @@ -83,7 +85,7 @@ jobs: runs-on: macos-15-large steps: - name: checkout - uses: actions/checkout@v4.1.0 + uses: actions/checkout@v5 with: fetch-depth: 1000 - name: macOS Unelevated CI @@ -100,7 +102,7 @@ jobs: runs-on: macos-15-large steps: - name: checkout - uses: actions/checkout@v4.1.0 + uses: actions/checkout@v5 with: fetch-depth: 1000 - name: macOS Elevated CI @@ -117,7 +119,7 @@ jobs: runs-on: macos-15-large steps: - name: checkout - uses: actions/checkout@v4.1.0 + uses: actions/checkout@v5 with: fetch-depth: 1000 - name: macOS Unelevated Others @@ -134,7 +136,7 @@ jobs: runs-on: macos-15-large steps: - name: checkout - uses: actions/checkout@v4.1.0 + uses: actions/checkout@v5 with: fetch-depth: 1000 - name: macOS Elevated Others @@ -167,7 +169,7 @@ jobs: - uses: actions/setup-dotnet@v4 with: global-json-file: ./global.json - + - name: Bootstrap packaging if: success() run: |- import-module ./build.psm1 diff --git a/.pipelines/templates/packaging/windows/package.yml b/.pipelines/templates/packaging/windows/package.yml index 83cdf730b5..03673d61c7 100644 --- a/.pipelines/templates/packaging/windows/package.yml +++ b/.pipelines/templates/packaging/windows/package.yml @@ -60,7 +60,7 @@ jobs: nativePathRoot: '$(Agent.TempDirectory)' ob_restore_phase: false - - template: rebuild-branch-check.yml@self + - template: /.pipelines/templates/rebuild-branch-check.yml@self - download: CoOrdinatedBuildPipeline artifact: drop_windows_build_windows_${{ parameters.runtime }}_release