Skip to content

Upgrade to Scala 2.13.4, switch CI to JDK 15, tweak CI configuration #10392

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nicolasstucki merged 5 commits into from
Nov 24, 2020
Merged

Upgrade to Scala 2.13.4, switch CI to JDK 15, tweak CI configuration #10392

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d8d80c4
Upgrade to Scala 2.13.4, switch CI to JDK 15
smarter Nov 19, 2020
f4b5017
Run bootstrapped tests on Java 8
smarter Nov 19, 2020
ed844e6
Ci: Don't run non-bootstrapped tests on PRs
smarter Nov 19, 2020
1e415b7
Add a way to run specific tests on the CI
smarter Nov 19, 2020
07bb6cf
Try to make lazy-impl.scala less flaky
smarter Nov 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Ci: Don't run non-bootstrapped tests on PRs 
They mostly check a subset of things that can be detected with
bootstrapped tests, it's still useful to know that everything works
without bootstrapping on master so keep those tests on pushed commits
and releases.
  • Loading branch information
@smarter
smarter committed Nov 23, 2020
commit ed844e663fcb8ab861f331b670a2c441bba7b8ff
36 changes: 11 additions & 25 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,19 @@ env:
DOTTY_CI_RUN: true

jobs:
test:
test_non_bootstrapped:
runs-on: [self-hosted, Linux]
container:
image: lampepfl/dotty:2020-11-19
volumes:
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
- ${{ github.workspace }}/../../cache/general:/root/.cache
if: "!(github.event_name == 'push' &&
startsWith(github.event.ref, 'refs/tags/sbt-dotty-'))"

if: "(
github.event_name == 'push' &&
!startsWith(github.event.ref, 'refs/tags/sbt-dotty-')
) ||
github.event_name == 'schedule')"
steps:
- name: Set JDK 15 as default
run: echo "/usr/lib/jvm/java-15-openjdk-amd64/bin" >> $GITHUB_PATH
Expand All @@ -42,7 +44,7 @@ jobs:
./project/scripts/sbt ";compile ;test"
./project/scripts/cmdTests

test_bootstrapped:
test:
runs-on: [self-hosted, Linux]
container:
image: lampepfl/dotty:2020-11-19
Expand Down Expand Up @@ -74,23 +76,7 @@ jobs:
./project/scripts/sbt ";scala3-bootstrapped/compile ;scala3-bootstrapped/test;sjsSandbox/run;sjsSandbox/test;sjsJUnitTests/test;sjsCompilerTests/test ;sbt-dotty/scripted scala2-compat/* ;configureIDE ;stdlib-bootstrapped/test:run ;stdlib-bootstrapped-tasty-tests/test"
./project/scripts/bootstrapCmdTests

## Only run bootstrapped tests for Windows since that's a superset of the
## non-bootstrapped tests and bootstrapping issues should be caught by
## the non-bootstrapped Linux runner.
# test-windows:
# runs-on: [self-hosted, Windows]
# if: "!(github.event_name == 'push' &&
# startsWith(github.event.ref, 'refs/tags/sbt-dotty-'))"

# steps:
# - name: Git Checkout
# uses: actions/checkout@v2

# - name: Test
# run: sbt ";compile ;test"
# shell: cmd

test_bootstrapped-windows:
test_windows:
runs-on: [self-hosted, Windows]
if: "!(github.event_name == 'push' &&
startsWith(github.event.ref, 'refs/tags/sbt-dotty-'))"
Expand Down Expand Up @@ -193,7 +179,7 @@ jobs:
- name: Test
run: ./project/scripts/sbt sbt-dotty/scripted

test_bootstrapped_java8:
test_java8:
runs-on: [self-hosted, Linux]
container:
image: lampepfl/dotty:2020-11-19
Expand Down Expand Up @@ -238,7 +224,7 @@ jobs:
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
- ${{ github.workspace }}/../../cache/general:/root/.cache
needs: [test, test_bootstrapped, community_build_a, community_build_b, test_sbt, test_bootstrapped_java8]
needs: [test_non_bootstrapped, test, community_build_a, community_build_b, test_sbt, test_java8]
if: github.event_name == 'schedule'
env:
NIGHTLYBUILD: yes
Expand Down Expand Up @@ -313,7 +299,7 @@ jobs:
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
- ${{ github.workspace }}/../../cache/general:/root/.cache
needs: [test, test_bootstrapped, community_build_a, community_build_b, test_sbt, test_bootstrapped_java8]
needs: [test_non_bootstrapped, test, community_build_a, community_build_b, test_sbt, test_java8]
if: github.event_name == 'push' &&
startsWith(github.event.ref, 'refs/tags/') &&
!startsWith(github.event.ref, 'refs/tags/sbt-dotty-')
Expand Down