From 4034a9df86d0c46f5404d96f23eb9ac3af2c1ded Mon Sep 17 00:00:00 2001 From: Yi Lin Date: Tue, 16 Apr 2024 01:27:42 +0000 Subject: [PATCH 1/4] Update the ignoredActions in merge check --- .github/workflows/merge-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge-check.yml b/.github/workflows/merge-check.yml index 56dade26e8..5ead5b4b86 100644 --- a/.github/workflows/merge-check.yml +++ b/.github/workflows/merge-check.yml @@ -20,7 +20,7 @@ jobs: # - this action # - minimal tests for stable Rust (we allow them to fail) # - binding tests (it may take long to run) - ignoreActions: "ready-to-merge,check-broken-links-in-docs,check-public-api-changes,minimal-tests-core/x86_64-unknown-linux-gnu/stable,minimal-tests-core/i686-unknown-linux-gnu/stable,minimal-tests-core/x86_64-apple-darwin/stable,v8-binding-test,openjdk-binding-test,jikesrvm-binding-test,julia-binding-test,ruby-binding-test (release),ruby-binding-test (debug)" + ignoreActions: "ready-to-merge,check-broken-links-in-docs,check-public-api-changes,minimal-tests-core/x86_64-unknown-linux-gnu/stable,minimal-tests-core/i686-unknown-linux-gnu/stable,minimal-tests-core/x86_64-apple-darwin/stable,extended-test-v8,extended-test-openjdk,extended-test-jikesrvm,extended-test-julia,extended-test-ruby (release),extended-test-ruby (debug)" # This action uses API. We have a quota of 1000 per hour. checkInterval: 600 env: From eaf000ba0510fdde192a1a0ddf0362c098ef4860 Mon Sep 17 00:00:00 2001 From: Yi Lin Date: Tue, 16 Apr 2024 01:34:15 +0000 Subject: [PATCH 2/4] Use a JSON array to list ignored actions --- .github/workflows/merge-check.yml | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/.github/workflows/merge-check.yml b/.github/workflows/merge-check.yml index 5ead5b4b86..c6d7ab55bc 100644 --- a/.github/workflows/merge-check.yml +++ b/.github/workflows/merge-check.yml @@ -7,20 +7,40 @@ on: branches: - master +env: + # Ignore some actions for the merge check: + # - This action itself + # - Public API check, doc broken link check: we allow them to fail. + # - Minimal tests for stable Rust: we allow them to fail. + # - Extended binding tests: it may take long to run. We don't want to wait for them. + IGNORED_ACTIONS: | + [ + "ready-to-merge", + "check-broken-links-in-docs", + "check-public-api-changes", + "minimal-tests-core/x86_64-unknown-linux-gnu/stable", + "minimal-tests-core/i686-unknown-linux-gnu/stable", + "minimal-tests-core/x86_64-apple-darwin/stable", + "extended-test-v8", + "extended-test-jikesrvm", + "extended-test-julia", + "extended-test-ruby (release)", + "extended-test-ruby (debug)" + ] + jobs: ready-to-merge: runs-on: ubuntu-latest steps: + - name: Print ignored actions + run: | + echo "Ignored actions: ${{ join(fromJson(env.IGNORED_ACTIONS)) }}" - name: 'Wait for status checks' id: waitforstatuschecks timeout-minutes: 120 uses: "WyriHaximus/github-action-wait-for-status@v1.8.0" with: - # Ignore some actions (based on what merge_group triggers): - # - this action - # - minimal tests for stable Rust (we allow them to fail) - # - binding tests (it may take long to run) - ignoreActions: "ready-to-merge,check-broken-links-in-docs,check-public-api-changes,minimal-tests-core/x86_64-unknown-linux-gnu/stable,minimal-tests-core/i686-unknown-linux-gnu/stable,minimal-tests-core/x86_64-apple-darwin/stable,extended-test-v8,extended-test-openjdk,extended-test-jikesrvm,extended-test-julia,extended-test-ruby (release),extended-test-ruby (debug)" + ignoreActions: "${{ join(fromJson(env.IGNORED_ACTIONS)) }}" # This action uses API. We have a quota of 1000 per hour. checkInterval: 600 env: From 60ef5d189b67fc30b6df4dcad7247d01028ffb4f Mon Sep 17 00:00:00 2001 From: Yi Lin Date: Tue, 16 Apr 2024 03:38:35 +0000 Subject: [PATCH 3/4] Fix typo --- .github/workflows/merge-check.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/merge-check.yml b/.github/workflows/merge-check.yml index c6d7ab55bc..661dbbed2f 100644 --- a/.github/workflows/merge-check.yml +++ b/.github/workflows/merge-check.yml @@ -21,20 +21,17 @@ env: "minimal-tests-core/x86_64-unknown-linux-gnu/stable", "minimal-tests-core/i686-unknown-linux-gnu/stable", "minimal-tests-core/x86_64-apple-darwin/stable", - "extended-test-v8", - "extended-test-jikesrvm", - "extended-test-julia", - "extended-test-ruby (release)", - "extended-test-ruby (debug)" + "extended-tests-v8", + "extended-tests-jikesrvm", + "extended-tests-julia", + "extended-tests-ruby (release)", + "extended-tests-ruby (debug)" ] jobs: ready-to-merge: runs-on: ubuntu-latest steps: - - name: Print ignored actions - run: | - echo "Ignored actions: ${{ join(fromJson(env.IGNORED_ACTIONS)) }}" - name: 'Wait for status checks' id: waitforstatuschecks timeout-minutes: 120 From 870433d998371fec8e97c0956833f006790b5af0 Mon Sep 17 00:00:00 2001 From: Yi Lin Date: Tue, 16 Apr 2024 06:37:48 +0000 Subject: [PATCH 4/4] Add openjdk tests to the ignored list --- .github/workflows/merge-check.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/merge-check.yml b/.github/workflows/merge-check.yml index 661dbbed2f..796237e2fa 100644 --- a/.github/workflows/merge-check.yml +++ b/.github/workflows/merge-check.yml @@ -24,6 +24,7 @@ env: "extended-tests-v8", "extended-tests-jikesrvm", "extended-tests-julia", + "extended-tests-openjdk", "extended-tests-ruby (release)", "extended-tests-ruby (debug)" ]