From 115192bae5d0f7123f6d1c36552e45ecf47dea27 Mon Sep 17 00:00:00 2001 From: Jacky Nguyen Date: Wed, 21 Apr 2021 20:23:38 -0400 Subject: [PATCH 1/3] Use sbt launcher which is already included in Github action ubuntu VM --- .github/workflows/branch-ci.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/branch-ci.yml b/.github/workflows/branch-ci.yml index 5c77e8f..a107b98 100644 --- a/.github/workflows/branch-ci.yml +++ b/.github/workflows/branch-ci.yml @@ -30,14 +30,10 @@ jobs: path: ~/.jabba key: ${{ runner.os }}-jabba-${{ hashFiles('build.sbt') }} - uses: actions/checkout@v2 - - uses: olafurpg/setup-scala@v10 - with: - java-version: adopt@1.11 - name: Compile and test run: | - csbt \ + sbt \ 'set core / Compile / scalacOptions += "-Werror"' \ 'set macros / Compile / scalacOptions += "-Werror"' \ compile \ - test \ - < /dev/null + test From 03165691190928c272de5b7547b0d805a45e0e3c Mon Sep 17 00:00:00 2001 From: Jacky Nguyen Date: Wed, 21 Apr 2021 20:41:36 -0400 Subject: [PATCH 2/3] Fix for sbt 1.5 --- .github/workflows/branch-ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/branch-ci.yml b/.github/workflows/branch-ci.yml index a107b98..9a71c9b 100644 --- a/.github/workflows/branch-ci.yml +++ b/.github/workflows/branch-ci.yml @@ -33,7 +33,9 @@ jobs: - name: Compile and test run: | sbt \ - 'set core / Compile / scalacOptions += "-Werror"' \ - 'set macros / Compile / scalacOptions += "-Werror"' \ + 'set core.jvm / Compile / scalacOptions += "-Werror"' \ + 'set core.js / Compile / scalacOptions += "-Werror"' \ + 'set macros.jvm / Compile / scalacOptions += "-Werror"' \ + 'set macros.js / Compile / scalacOptions += "-Werror"' \ compile \ test From b37934144bc1ecfa3e2ab47047993192283096a3 Mon Sep 17 00:00:00 2001 From: Jacky Nguyen Date: Wed, 21 Apr 2021 20:47:41 -0400 Subject: [PATCH 3/3] Fix master-ci.yaml as well --- .github/workflows/master-ci.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/master-ci.yml b/.github/workflows/master-ci.yml index b0a369c..b89b54d 100644 --- a/.github/workflows/master-ci.yml +++ b/.github/workflows/master-ci.yml @@ -29,14 +29,12 @@ jobs: path: ~/.jabba key: ${{ runner.os }}-jabba-${{ hashFiles('build.sbt') }} - uses: actions/checkout@v2 - - uses: olafurpg/setup-scala@v10 - with: - java-version: adopt@1.11 - name: Compile and test run: | - csbt \ - 'set core / Compile / scalacOptions += "-Werror"' \ - 'set macros / Compile / scalacOptions += "-Werror"' \ + sbt \ + 'set core.jvm / Compile / scalacOptions += "-Werror"' \ + 'set core.js / Compile / scalacOptions += "-Werror"' \ + 'set macros.jvm / Compile / scalacOptions += "-Werror"' \ + 'set macros.js / Compile / scalacOptions += "-Werror"' \ compile \ - test \ - < /dev/null + test