diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3ede6fadcd..65e97d8160 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,19 +17,22 @@ jobs: strategy: fail-fast: false matrix: - java: [adopt@1.8, adopt@1.11] + java: [ '8', '11' ] os: [windows-latest, ubuntu-latest] exclude: - os: windows-latest - java: adopt@1.8 + 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 "scalafmt@scalameta.org" && git config --global user.name "scalafmt" @@ -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 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a9226c1882..06437ac1ba 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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: