diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cfde05cc..407703a7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,44 +23,33 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.12.17] - java: [temurin@11] + java: [temurin@8] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Setup Java (temurin@11) - if: matrix.java == 'temurin@11' - uses: actions/setup-java@v2 + - name: Setup Java (temurin@8) + if: matrix.java == 'temurin@8' + uses: actions/setup-java@v3 with: distribution: temurin - java-version: 11 - - - name: Cache sbt - uses: actions/cache@v2 - with: - path: | - ~/.sbt - ~/.ivy2/cache - ~/.coursier/cache/v1 - ~/.cache/coursier/v1 - ~/AppData/Local/Coursier/Cache/v1 - ~/Library/Caches/Coursier/v1 - key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} + java-version: 8 + cache: sbt - name: Check that workflows are up to date - run: sbt ++${{ matrix.scala }} githubWorkflowCheck + run: sbt '++ ${{ matrix.scala }}' githubWorkflowCheck - name: Build project - run: sbt ++${{ matrix.scala }} test + run: sbt '++ ${{ matrix.scala }}' test - name: Compress target directories run: tar cf targets.tar jsonld/target/jvm-2.11 target ringbuffer/target/jvm-3 api/target/jvm-3 inspections/target/jvm-2.12 benchmarks/target/jvm-2.13 logstash/target/jvm-2.11 ringbuffer/target/jvm-2.11 fixtures/target/jvm-2.11 target/jvm-2.13 inspections/target/jvm-2.13 scripting/target/jvm-2.12 docs/target fixtures/target/jvm-3 ringbuffer/target/jvm-2.13 dsl/target/jvm-2.12 dsl/target/jvm-3 logstash/target/jvm-2.13 target/jvm-3 ringbuffer/target/jvm-2.12 api/target/jvm-2.12 inspections/target/jvm-3 target/jvm-2.12 generic/target/jvm-2.13 generic/target/jvm-3 logstash/target/jvm-2.12 fixtures/target/jvm-2.13 benchmarks/target/jvm-3 jsonld/target/jvm-2.13 scripting/target/jvm-3 logstash/target/jvm-3 api/target/jvm-2.11 jsonld/target/jvm-3 benchmarks/target/jvm-2.12 generic/target/jvm-2.11 target/jvm-2.11 dsl/target/jvm-2.11 jsonld/target/jvm-2.12 generic/target/jvm-2.12 api/target/jvm-2.13 scripting/target/jvm-2.13 dsl/target/jvm-2.13 benchmarks/target/jvm-2.11 inspections/target/jvm-2.11 scripting/target/jvm-2.11 fixtures/target/jvm-2.12 project/target - name: Upload target directories - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: target-${{ matrix.os }}-${{ matrix.scala }}-${{ matrix.java }} path: targets.tar @@ -73,35 +62,24 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.12.17] - java: [temurin@11] + java: [temurin@8] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Setup Java (temurin@11) - if: matrix.java == 'temurin@11' - uses: actions/setup-java@v2 + - name: Setup Java (temurin@8) + if: matrix.java == 'temurin@8' + uses: actions/setup-java@v3 with: distribution: temurin - java-version: 11 - - - name: Cache sbt - uses: actions/cache@v2 - with: - path: | - ~/.sbt - ~/.ivy2/cache - ~/.coursier/cache/v1 - ~/.cache/coursier/v1 - ~/AppData/Local/Coursier/Cache/v1 - ~/Library/Caches/Coursier/v1 - key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} + java-version: 8 + cache: sbt - name: Download target directories (2.12.17) - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: name: target-${{ matrix.os }}-2.12.17-${{ matrix.java }} @@ -111,4 +89,4 @@ jobs: rm targets.tar - name: Publish project - run: sbt ++${{ matrix.scala }} +publish + run: sbt +publish diff --git a/project/plugins.sbt b/project/plugins.sbt index 198608cf..cc31aae9 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -16,7 +16,7 @@ addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.9.0") addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0") // https://github.com/djspiewak/sbt-github-actions -addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.14.2") +addSbtPlugin("com.github.sbt" % "sbt-github-actions" % "0.16.0") // https://github.com/ktoso/sbt-jmh addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.4")