From cf3f694cc59c2b3ca82cef0bee672e05bde1404c Mon Sep 17 00:00:00 2001 From: John Watson Date: Fri, 5 Jul 2024 22:10:00 -0700 Subject: [PATCH 1/2] Ignore the japicmp diff check for bot PRs --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fa2a758d8b5..9b1001e6439 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -74,8 +74,8 @@ jobs: RUN_JMH_BASED_TESTS: ${{ matrix.jmh-based-tests }} - name: Check for diff - # The jApiCmp diff compares current to latest, which isn't appropriate for release branches - if: ${{ !startsWith(github.ref_name, 'release/') && !startsWith(github.base_ref, 'release/') }} + # The jApiCmp diff compares current to latest, which isn't appropriate for release branches, or for bot-generated PRs + if: ${{ !startsWith(github.ref_name, 'release/') && !startsWith(github.base_ref, 'release/') && !equals(github.actor, 'opentelemetrybot') }} run: | # need to "git add" in case any generated files did not already exist git add docs/apidiffs From 0ff4cefcb925dc546d285c1780cd82ce6a7d8a80 Mon Sep 17 00:00:00 2001 From: John Watson Date: Fri, 5 Jul 2024 22:17:12 -0700 Subject: [PATCH 2/2] fix syntax --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9b1001e6439..8b928eee9f1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -75,7 +75,7 @@ jobs: - name: Check for diff # The jApiCmp diff compares current to latest, which isn't appropriate for release branches, or for bot-generated PRs - if: ${{ !startsWith(github.ref_name, 'release/') && !startsWith(github.base_ref, 'release/') && !equals(github.actor, 'opentelemetrybot') }} + if: ${{ !startsWith(github.ref_name, 'release/') && !startsWith(github.base_ref, 'release/') && (github.actor != 'opentelemetrybot') }} run: | # need to "git add" in case any generated files did not already exist git add docs/apidiffs