From 238b28d3ebe20c0f8c6c50241a9c59e8fb471c9b Mon Sep 17 00:00:00 2001 From: Justin Florentine Date: Fri, 1 Mar 2024 08:51:38 -0500 Subject: [PATCH 1/3] sets metaspace explicitly after gradle reset a la https://github.com/gradle/gradle/issues/19750 Signed-off-by: Justin Florentine --- gradle.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/gradle.properties b/gradle.properties index cc51c2b730f..684efa87413 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,6 +3,7 @@ version=24.2.0-SNAPSHOT org.gradle.welcome=never # Set exports/opens flags required by Google Java Format and ErrorProne plugins. (JEP-396) org.gradle.jvmargs=-Xmx4g \ +-XX:MaxMetaspaceSize=256m \ --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \ --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \ --add-exports jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED \ From 47be746ea7ac93009af5a5eb27685974def33b16 Mon Sep 17 00:00:00 2001 From: Justin Florentine Date: Fri, 1 Mar 2024 09:02:09 -0500 Subject: [PATCH 2/3] allow manual runs of accept-test workflow Signed-off-by: Justin Florentine --- .github/workflows/acceptance-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/acceptance-tests.yml b/.github/workflows/acceptance-tests.yml index 39af80ba6e6..9d4007fccb8 100644 --- a/.github/workflows/acceptance-tests.yml +++ b/.github/workflows/acceptance-tests.yml @@ -56,7 +56,7 @@ jobs: permissions: statuses: write checks: write - if: ${{ needs.shouldRun.outputs.shouldRun == 'true'}} + if: ${{ needs.shouldRun.outputs.shouldRun == 'true' || github.event_name == 'workflow_dispatch'}} strategy: fail-fast: true matrix: From dbb1387b12c90cb0605d12fc267945be4d265067 Mon Sep 17 00:00:00 2001 From: Justin Florentine Date: Fri, 1 Mar 2024 09:16:42 -0500 Subject: [PATCH 3/3] don't try to get prs that don't exist Signed-off-by: Justin Florentine --- .github/workflows/acceptance-tests.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/acceptance-tests.yml b/.github/workflows/acceptance-tests.yml index 9d4007fccb8..48e70a15554 100644 --- a/.github/workflows/acceptance-tests.yml +++ b/.github/workflows/acceptance-tests.yml @@ -26,9 +26,14 @@ jobs: env: # fun fact, this changes based on incoming event, it will be different when we run this on pushes to main RELEVANT_SHA: ${{ github.event.pull_request.head.sha || github.sha }} + EVENT_NAME: ${{ github.event_name }} with: script: | const { RELEVANT_SHA } = process.env; + const { EVENT_NAME } = process.env; + if(EVENT_NAME === 'workflow_dispatch') { + return true; + } const { data: { statuses } } = await github.rest.repos.getCombinedStatusForRef({ owner: context.repo.owner, repo: context.repo.repo, @@ -49,6 +54,7 @@ jobs: console.log("approvingReviews = %j", approvingReviews.length); return shouldRun; + acceptanceTestEthereum: runs-on: ubuntu-22.04 name: "Acceptance Runner" @@ -56,7 +62,7 @@ jobs: permissions: statuses: write checks: write - if: ${{ needs.shouldRun.outputs.shouldRun == 'true' || github.event_name == 'workflow_dispatch'}} + if: ${{ needs.shouldRun.outputs.shouldRun == 'true'}} strategy: fail-fast: true matrix: