From 1531e295f80ff404724560f37b4c2a57d07feea3 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Fri, 25 Nov 2022 09:03:23 +0100 Subject: [PATCH 1/2] Use Java version in community-build --- .github/workflows/ci.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d78148c8fb6f..04b4032c2c31 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -263,6 +263,9 @@ jobs: )" steps: + - name: Set JDK 15 as default + run: echo "/usr/lib/jvm/java-15-openjdk-amd64/bin" >> $GITHUB_PATH + - name: Reset existing repo run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true @@ -310,6 +313,9 @@ jobs: )" steps: + - name: Set JDK 15 as default + run: echo "/usr/lib/jvm/java-15-openjdk-amd64/bin" >> $GITHUB_PATH + - name: Reset existing repo run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true @@ -357,6 +363,9 @@ jobs: )" steps: + - name: Set JDK 16 as default + run: echo "/usr/lib/jvm/java-16-openjdk-amd64/bin" >> $GITHUB_PATH + - name: Reset existing repo run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true From 67a511feab412cd0890a666c481799a66db62b2e Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Fri, 25 Nov 2022 17:41:54 +0100 Subject: [PATCH 2/2] Add CI filter for individual community builds --- .github/workflows/ci.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 04b4032c2c31..4c3a95e48246 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -256,6 +256,7 @@ jobs: github.event_name == 'pull_request' && !contains(github.event.pull_request.body, '[skip ci]') && !contains(github.event.pull_request.body, '[skip community_build]') + && !contains(github.event.pull_request.body, '[skip community_build_a]') ) || ( github.event_name == 'workflow_dispatch' @@ -306,6 +307,7 @@ jobs: github.event_name == 'pull_request' && !contains(github.event.pull_request.body, '[skip ci]') && !contains(github.event.pull_request.body, '[skip community_build]') + && !contains(github.event.pull_request.body, '[skip community_build_b]') ) || ( github.event_name == 'workflow_dispatch' @@ -356,6 +358,7 @@ jobs: github.event_name == 'pull_request' && !contains(github.event.pull_request.body, '[skip ci]') && !contains(github.event.pull_request.body, '[skip community_build]') + && !contains(github.event.pull_request.body, '[skip community_build_c]') ) || ( github.event_name == 'workflow_dispatch'