From 8116e831c36c78e299da373b329b985d8dd876ba Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Sun, 13 Oct 2024 01:48:15 +0100 Subject: [PATCH 1/2] CI: install sbt more changes --- .github/workflows/headers.yml | 5 ++++- .github/workflows/link-validator.yml | 5 ++++- .github/workflows/nightly.yml | 3 +++ .github/workflows/publish-1.0-docs.yml | 3 +++ .github/workflows/publish-1.0-snapshots.yml | 3 +++ .github/workflows/publish-1.1-docs.yml | 3 +++ .github/workflows/publish.yml | 6 ++++++ .github/workflows/validate-and-test.yml | 6 ++++++ 8 files changed, 32 insertions(+), 2 deletions(-) diff --git a/.github/workflows/headers.yml b/.github/workflows/headers.yml index 6e39d6612..742da37d3 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 35cc40226..990fe0acb 100644 --- a/.github/workflows/link-validator.yml +++ b/.github/workflows/link-validator.yml @@ -10,7 +10,7 @@ on: jobs: validate-links: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 if: github.repository == 'apache/pekko-http' steps: - name: Checkout @@ -29,6 +29,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/nightly.yml b/.github/workflows/nightly.yml index 033952a50..a47574e47 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -29,6 +29,9 @@ jobs: distribution: temurin java-version: ${{ matrix.JDK }} + - name: Install sbt + uses: sbt/setup-sbt@v1 + - name: Cache Coursier cache uses: coursier/cache-action@v6 diff --git a/.github/workflows/publish-1.0-docs.yml b/.github/workflows/publish-1.0-docs.yml index 6f207e8c6..85ec05584 100644 --- a/.github/workflows/publish-1.0-docs.yml +++ b/.github/workflows/publish-1.0-docs.yml @@ -39,6 +39,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/publish-1.0-snapshots.yml b/.github/workflows/publish-1.0-snapshots.yml index 7db6aeb37..29d498e0b 100644 --- a/.github/workflows/publish-1.0-snapshots.yml +++ b/.github/workflows/publish-1.0-snapshots.yml @@ -24,6 +24,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/publish-1.1-docs.yml b/.github/workflows/publish-1.1-docs.yml index cf8bac87c..210331aed 100644 --- a/.github/workflows/publish-1.1-docs.yml +++ b/.github/workflows/publish-1.1-docs.yml @@ -38,6 +38,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/publish.yml b/.github/workflows/publish.yml index dfdd0294a..3b28a64bb 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -23,6 +23,9 @@ jobs: distribution: temurin java-version: 8 + - name: Install sbt + uses: sbt/setup-sbt@v1 + - name: Cache Coursier cache uses: coursier/cache-action@v6 @@ -53,6 +56,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/validate-and-test.yml b/.github/workflows/validate-and-test.yml index 9cdc44c0c..bcd2fcebb 100644 --- a/.github/workflows/validate-and-test.yml +++ b/.github/workflows/validate-and-test.yml @@ -29,6 +29,9 @@ jobs: distribution: temurin java-version: 8 + - name: Install sbt + uses: sbt/setup-sbt@v1 + - name: Cache Coursier cache uses: coursier/cache-action@v6 @@ -74,6 +77,9 @@ jobs: distribution: temurin java-version: ${{ matrix.JDK }} + - name: Install sbt + uses: sbt/setup-sbt@v1 + - name: Cache Coursier cache uses: coursier/cache-action@v6 From ad20f111a9b2e5653dc9a63671da02de5392c0da Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Mon, 14 Oct 2024 09:04:04 +0100 Subject: [PATCH 2/2] Update dependency-graph.yml --- .github/workflows/dependency-graph.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/dependency-graph.yml b/.github/workflows/dependency-graph.yml index 94eec143c..6d9229573 100644 --- a/.github/workflows/dependency-graph.yml +++ b/.github/workflows/dependency-graph.yml @@ -7,8 +7,11 @@ jobs: dependency-graph: name: Update Dependency Graph runs-on: ubuntu-latest + if: github.repository == 'apache/pekko-http' steps: - uses: actions/checkout@v4 + - name: Install sbt + uses: sbt/setup-sbt@v1 - uses: scalacenter/sbt-dependency-submission@v2 with: modules-ignore: pekko-http-tests_3 pekko-http-docs_3