Skip to content

Commit

Permalink
YML: use setup-java instead of setup-scala
Browse files Browse the repository at this point in the history
  • Loading branch information
kitbellew committed Dec 11, 2022
1 parent e8bf80f commit 43adb34
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 10 deletions.
19 changes: 13 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,22 @@ jobs:
strategy:
fail-fast: false
matrix:
java: [[email protected], [email protected]]
java: [ '8', '11' ]
os: [windows-latest, ubuntu-latest]
exclude:
- os: windows-latest
java: [email protected]
java: '8'
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: olafurpg/setup-scala@v13
with:
fetch-depth: 0
- name: Set up JVM
uses: actions/setup-java@v3
with:
java-version: ${{ matrix.java }}
# https://github.com/dwijnand/sbt-dynver#setup
- run: git fetch --tags --unshallow -f
distribution: 'temurin'
cache: 'sbt'
- run:
# for GitOps tests
git config --global user.email "[email protected]" && git config --global user.name "scalafmt"
Expand All @@ -41,7 +44,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: olafurpg/setup-scala@v13
- uses: actions/setup-java@v3
with:
java-version: '11'
distribution: 'temurin'
cache: 'sbt'
- run: ./scalafmt --test
- run: yarn install
- run: yarn format-check
Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: olafurpg/setup-scala@v13
- uses: olafurpg/setup-gpg@v3
# https://github.com/dwijnand/sbt-dynver#setup
- run: git fetch --tags --unshallow -f
with:
fetch-depth: 0
- uses: actions/setup-java@v3
with:
java-version: '11'
distribution: 'temurin'
cache: 'sbt'
- name: Publish ${{ github.ref }}
run: sbt ci-release docs/docusaurusPublishGhpages
env:
Expand Down

0 comments on commit 43adb34

Please sign in to comment.