From ad72ae0fa33574cc59f47704e5b3a236fcf51870 Mon Sep 17 00:00:00 2001 From: Genevieve Warren <24882762+gewarren@users.noreply.github.com> Date: Tue, 8 Apr 2025 10:15:16 -0700 Subject: [PATCH 1/4] try to fix auto-merge --- .github/policies/auto-merge.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/policies/auto-merge.yml b/.github/policies/auto-merge.yml index 4519201e7a8..d4065a7654f 100644 --- a/.github/policies/auto-merge.yml +++ b/.github/policies/auto-merge.yml @@ -19,6 +19,8 @@ configuration: - or: - isActivitySender: user: dotnet-policy-service[bot] + - isActivitySender: + user: dotnet-policy-service then: - enableAutoMerge: mergeMethod: Squash @@ -33,8 +35,11 @@ configuration: label: ':octocat: auto-merge' - targetsBranch: branch: live - - isActivitySender: - user: dotnet-policy-service[bot] + - or: + - isActivitySender: + user: dotnet-policy-service[bot] + - isActivitySender: + user: dotnet-policy-service then: - enableAutoMerge: mergeMethod: Merge From 43f0e206cdd5fc2fd542a1197305bbcbc0b6033a Mon Sep 17 00:00:00 2001 From: Genevieve Warren <24882762+gewarren@users.noreply.github.com> Date: Tue, 8 Apr 2025 10:18:05 -0700 Subject: [PATCH 2/4] remove unnecessary OR --- .github/policies/auto-merge.yml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/policies/auto-merge.yml b/.github/policies/auto-merge.yml index d4065a7654f..fda9b1ab8a3 100644 --- a/.github/policies/auto-merge.yml +++ b/.github/policies/auto-merge.yml @@ -16,11 +16,8 @@ configuration: label: ':octocat: auto-merge' - targetsBranch: branch: main - - or: - - isActivitySender: - user: dotnet-policy-service[bot] - - isActivitySender: - user: dotnet-policy-service + - isActivitySender: + user: dotnet-policy-service[bot] then: - enableAutoMerge: mergeMethod: Squash @@ -35,11 +32,8 @@ configuration: label: ':octocat: auto-merge' - targetsBranch: branch: live - - or: - - isActivitySender: - user: dotnet-policy-service[bot] - - isActivitySender: - user: dotnet-policy-service + - isActivitySender: + user: dotnet-policy-service[bot] then: - enableAutoMerge: mergeMethod: Merge From c9beadb85b23282c93d49732455dc158f881e092 Mon Sep 17 00:00:00 2001 From: Genevieve Warren <24882762+gewarren@users.noreply.github.com> Date: Tue, 8 Apr 2025 10:22:49 -0700 Subject: [PATCH 3/4] add check for build warnings workflow --- .../workflows/check-for-build-warnings.yml | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .github/workflows/check-for-build-warnings.yml diff --git a/.github/workflows/check-for-build-warnings.yml b/.github/workflows/check-for-build-warnings.yml new file mode 100644 index 00000000000..6586f9fc0e7 --- /dev/null +++ b/.github/workflows/check-for-build-warnings.yml @@ -0,0 +1,27 @@ +name: 'OPS status checker' + +on: + pull_request_target: + types: [opened, synchronize, reopened] + +permissions: + contents: read + +jobs: + status_checker_job: + name: Look for build warnings + runs-on: ubuntu-latest + permissions: + statuses: read + pull-requests: write + steps: + - name: Harden Runner + uses: step-security/harden-runner@c6295a65d1254861815972266d5933fd6e532bdf # v2.11.1 + with: + egress-policy: audit + + - uses: dotnet/docs-tools/actions/status-checker@main + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} + docs_path: "docs" + url_base_path: "dotnet" From 676acfb7c57e5c99d579da4a8aeb2b329264bde1 Mon Sep 17 00:00:00 2001 From: Genevieve Warren <24882762+gewarren@users.noreply.github.com> Date: Tue, 8 Apr 2025 17:38:15 -0700 Subject: [PATCH 4/4] Update status-checker action mode to warning --- .github/workflows/check-for-build-warnings.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/check-for-build-warnings.yml b/.github/workflows/check-for-build-warnings.yml index 6586f9fc0e7..deb8c8b53f4 100644 --- a/.github/workflows/check-for-build-warnings.yml +++ b/.github/workflows/check-for-build-warnings.yml @@ -23,5 +23,4 @@ jobs: - uses: dotnet/docs-tools/actions/status-checker@main with: repo_token: ${{ secrets.GITHUB_TOKEN }} - docs_path: "docs" - url_base_path: "dotnet" + mode: "warning"