Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
aslesarenko committed Jan 23, 2021
2 parents 64bbfd8 + cc8d409 commit 9f6d129
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
matrix:
os: [ubuntu-latest]
scala: [2.12.10, 2.11.12]
java: [adopt@1.11]
java: [adopt@1.8]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout current branch (full)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Setup Java and Scala
uses: olafurpg/setup-scala@v10
with:
java-version: adopt@1.11
java-version: adopt@1.8

- name: Cache sbt
uses: actions/cache@v2
Expand Down

0 comments on commit 9f6d129

Please sign in to comment.