From 6c115480301a558be174ad7fe7a6a8fa64007307 Mon Sep 17 00:00:00 2001 From: Tom Grigg Date: Sat, 16 Jan 2021 09:08:23 -0800 Subject: [PATCH] CI: run `test_sbt` by default for pull requests and pushes Now that we're using sbt 1.4.x and batch mode for scripted tests, `test_sbt` runs quick enough to enable it by default. --- .github/workflows/ci.yaml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 61dee625300e..a9af880284cf 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -241,14 +241,11 @@ jobs: - ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache - ${{ github.workspace }}/../../cache/general:/root/.cache if: "github.event_name == 'schedule' && github.repository == 'lampepfl/dotty' - || ( - github.event_name == 'push' - && startsWith(github.event.ref, 'refs/tags/') - ) + || github.event_name == 'push' || ( github.event_name == 'pull_request' && !contains(github.event.pull_request.body, '[skip ci]') - && contains(github.event.pull_request.body, '[test_sbt]') + && !contains(github.event.pull_request.body, '[skip test_sbt]') )" steps: