From ca2801cf275cdc80cce33720876b97d4f20962e6 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Sun, 13 Oct 2024 11:44:00 +0100 Subject: [PATCH] CI: use setup-sbt --- .github/workflows/build-test.yml | 33 +++++++++++++++++-- .github/workflows/headers.yml | 5 ++- .github/workflows/link-validator.yml | 3 ++ .../nightly-snapshot-dependency-test.yml | 3 ++ .github/workflows/publish-1.0-docs.yml | 3 ++ .github/workflows/publish-1.0-nightly.yml | 3 ++ .github/workflows/publish-1.1-docs.yml | 3 ++ .github/workflows/publish-nightly.yml | 3 ++ 8 files changed, 52 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index c1ab2655..16128c63 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -27,7 +27,10 @@ jobs: with: distribution: temurin java-version: 11 - + + - name: Install sbt + uses: sbt/setup-sbt@v1 + - name: Cache Coursier cache uses: coursier/cache-action@v6 @@ -51,14 +54,18 @@ jobs: with: distribution: temurin java-version: 11 + + - name: Install sbt + uses: sbt/setup-sbt@v1 + - name: Cache Coursier cache uses: coursier/cache-action@v6 + - name: Compile benchmarks run: |- cd benchmark-java sbt test:compile - compile-and-test: name: Compile and test runs-on: ubuntu-latest @@ -79,6 +86,12 @@ jobs: distribution: temurin java-version: ${{ matrix.JAVA_VERSION }} + - name: Install sbt + uses: sbt/setup-sbt@v1 + + - name: Install sbt + uses: sbt/setup-sbt@v1 + - name: Cache Coursier cache uses: coursier/cache-action@v6 @@ -111,6 +124,9 @@ jobs: distribution: temurin java-version: 8 + - name: Install sbt + uses: sbt/setup-sbt@v1 + - name: Install go uses: actions/setup-go@v5 with: @@ -140,6 +156,9 @@ jobs: distribution: temurin java-version: 8 + - name: Install sbt + uses: sbt/setup-sbt@v1 + - name: Cache Coursier cache uses: coursier/cache-action@v6 @@ -196,6 +215,9 @@ jobs: distribution: temurin java-version: 8 + - name: Install sbt + uses: sbt/setup-sbt@v1 + - name: Cache Coursier cache uses: coursier/cache-action@v6 @@ -241,9 +263,14 @@ jobs: with: distribution: temurin java-version: 11 + + - name: Install sbt + uses: sbt/setup-sbt@v1 + - name: Cache Coursier cache uses: coursier/cache-action@v6 - - name: Test Maven Java + + - name: Build Paradox Docs run: |- cp .jvmopts-ci .jvmopts sbt paradox diff --git a/.github/workflows/headers.yml b/.github/workflows/headers.yml index c1c0e45e..145ceef6 100644 --- a/.github/workflows/headers.yml +++ b/.github/workflows/headers.yml @@ -8,7 +8,7 @@ permissions: {} jobs: check-headers: name: Check headers - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Checkout uses: actions/checkout@v4 @@ -19,6 +19,9 @@ jobs: distribution: temurin java-version: 8 + - name: Install sbt + uses: sbt/setup-sbt@v1 + - name: Cache Coursier cache uses: coursier/cache-action@v6 diff --git a/.github/workflows/link-validator.yml b/.github/workflows/link-validator.yml index a2dc5cc7..c987318a 100644 --- a/.github/workflows/link-validator.yml +++ b/.github/workflows/link-validator.yml @@ -24,6 +24,9 @@ jobs: distribution: temurin java-version: 11 + - name: Install sbt + uses: sbt/setup-sbt@v1 + - name: Cache Coursier cache uses: coursier/cache-action@v6 diff --git a/.github/workflows/nightly-snapshot-dependency-test.yml b/.github/workflows/nightly-snapshot-dependency-test.yml index 2150d7d9..8b863f5d 100644 --- a/.github/workflows/nightly-snapshot-dependency-test.yml +++ b/.github/workflows/nightly-snapshot-dependency-test.yml @@ -23,6 +23,9 @@ jobs: distribution: temurin java-version: 8 + - name: Install sbt + uses: sbt/setup-sbt@v1 + - name: Test run: |- cp .jvmopts-ci .jvmopts diff --git a/.github/workflows/publish-1.0-docs.yml b/.github/workflows/publish-1.0-docs.yml index aafe5bbb..97995391 100644 --- a/.github/workflows/publish-1.0-docs.yml +++ b/.github/workflows/publish-1.0-docs.yml @@ -22,6 +22,9 @@ jobs: distribution: temurin java-version: 8 + - name: Install sbt + uses: sbt/setup-sbt@v1 + - name: Build Documentation run: |- cp .jvmopts-ci .jvmopts diff --git a/.github/workflows/publish-1.0-nightly.yml b/.github/workflows/publish-1.0-nightly.yml index 502e4c48..71f4488c 100644 --- a/.github/workflows/publish-1.0-nightly.yml +++ b/.github/workflows/publish-1.0-nightly.yml @@ -24,6 +24,9 @@ jobs: distribution: temurin java-version: 8 + - name: Install sbt + uses: sbt/setup-sbt@v1 + - name: Publish run: |- cp .jvmopts-ci .jvmopts diff --git a/.github/workflows/publish-1.1-docs.yml b/.github/workflows/publish-1.1-docs.yml index 7dd8527c..36d6bf9a 100644 --- a/.github/workflows/publish-1.1-docs.yml +++ b/.github/workflows/publish-1.1-docs.yml @@ -21,6 +21,9 @@ jobs: distribution: temurin java-version: 8 + - name: Install sbt + uses: sbt/setup-sbt@v1 + - name: Build Documentation run: |- cp .jvmopts-ci .jvmopts diff --git a/.github/workflows/publish-nightly.yml b/.github/workflows/publish-nightly.yml index bcee2c98..a3b54442 100644 --- a/.github/workflows/publish-nightly.yml +++ b/.github/workflows/publish-nightly.yml @@ -23,6 +23,9 @@ jobs: distribution: temurin java-version: 8 + - name: Install sbt + uses: sbt/setup-sbt@v1 + - name: Publish run: |- cp .jvmopts-ci .jvmopts