You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pekko.apache.org by md...@apache.org on 2023/03/27 19:20:37 UTC
[incubator-pekko-projection] branch main updated: Replace setup-scala with setup-java
This is an automated email from the ASF dual-hosted git repository.
mdedetrich pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-pekko-projection.git
The following commit(s) were added to refs/heads/main by this push:
new b0730af Replace setup-scala with setup-java
b0730af is described below
commit b0730af8526e4e481b3fb5b93c0ba49c53d956ba
Author: Matthew de Detrich <ma...@aiven.io>
AuthorDate: Mon Mar 27 20:49:41 2023 +0200
Replace setup-scala with setup-java
---
.github/workflows/checks.yml | 15 +++++++++------
.github/workflows/integration-tests-cassandra.yml | 11 ++++++-----
.github/workflows/integration-tests-jdbc.yml | 11 ++++++-----
.github/workflows/integration-tests-kafka.yml | 11 ++++++-----
.github/workflows/integration-tests-slick.yml | 11 ++++++-----
.github/workflows/release.yml | 5 ++++-
.github/workflows/unit-tests.yml | 11 ++++++-----
7 files changed, 43 insertions(+), 32 deletions(-)
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index fa3de3e..596d140 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -25,9 +25,10 @@ jobs:
git checkout scratch
- name: Set up JDK 11
- uses: olafurpg/setup-scala@v13
+ uses: actions/setup-java@v3
with:
- java-version: adopt@1.11.0-9
+ java-version: 11
+ distribution: temurin
- name: Cache Coursier cache
uses: coursier/cache-action@v6.4.0
@@ -51,9 +52,10 @@ jobs:
git checkout scratch
- name: Set up JDK 11
- uses: olafurpg/setup-scala@v13
+ uses: actions/setup-java@v3
with:
- java-version: adopt@1.11.0-9
+ java-version: 11
+ distribution: temurin
- name: Cache Coursier cache
uses: coursier/cache-action@v6.4.0
@@ -77,9 +79,10 @@ jobs:
git checkout scratch
- name: Set up JDK 11
- uses: olafurpg/setup-scala@v13
+ uses: actions/setup-java@v3
with:
- java-version: adopt@1.11.0-9
+ java-version: 11
+ distribution: temurin
- name: Cache Coursier cache
uses: coursier/cache-action@v6.4.0
diff --git a/.github/workflows/integration-tests-cassandra.yml b/.github/workflows/integration-tests-cassandra.yml
index 9c918dc..8107397 100644
--- a/.github/workflows/integration-tests-cassandra.yml
+++ b/.github/workflows/integration-tests-cassandra.yml
@@ -15,10 +15,10 @@ jobs:
fail-fast: false
matrix:
include:
- - { java-version: adopt@1.8, scala-version: 2.13.10, sbt-opts: '' }
- - { java-version: adopt@1.11.0-9, scala-version: 2.13.10, sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
- - { java-version: adopt@1.8, scala-version: 2.12.17, sbt-opts: '' }
- - { java-version: adopt@1.11.0-9, scala-version: 2.12.17, sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
+ - { java-version: 8, scala-version: 2.13.10, sbt-opts: '' }
+ - { java-version: 11, scala-version: 2.13.10, sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
+ - { java-version: 8, scala-version: 2.12.17, sbt-opts: '' }
+ - { java-version: 11, scala-version: 2.12.17, sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
steps:
- name: Checkout
uses: actions/checkout@v3
@@ -32,9 +32,10 @@ jobs:
git checkout scratch
- name: Setup JDK ${{ matrix.java-version }}
- uses: olafurpg/setup-scala@v13
+ uses: actions/setup-java@v3
with:
java-version: ${{ matrix.java-version }}
+ distribution: temurin
- name: Cache Coursier cache
uses: coursier/cache-action@v6.4.0
diff --git a/.github/workflows/integration-tests-jdbc.yml b/.github/workflows/integration-tests-jdbc.yml
index 6ca3e28..e6b00b6 100644
--- a/.github/workflows/integration-tests-jdbc.yml
+++ b/.github/workflows/integration-tests-jdbc.yml
@@ -15,10 +15,10 @@ jobs:
fail-fast: false
matrix:
include:
- - { java-version: adopt@1.8, scala-version: 2.13.10, sbt-opts: '' }
- - { java-version: adopt@1.11.0-9, scala-version: 2.13.10, sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
- - { java-version: adopt@1.8, scala-version: 2.12.17, sbt-opts: '' }
- - { java-version: adopt@1.11.0-9, scala-version: 2.12.17, sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
+ - { java-version: 8, scala-version: 2.13.10, sbt-opts: '' }
+ - { java-version: 11, scala-version: 2.13.10, sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
+ - { java-version: 8, scala-version: 2.12.17, sbt-opts: '' }
+ - { java-version: 11, scala-version: 2.12.17, sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
steps:
- name: Checkout
uses: actions/checkout@v3
@@ -36,9 +36,10 @@ jobs:
cp container-license-acceptance.txt jdbc/src/it/resources/container-license-acceptance.txt
- name: Setup JDK ${{ matrix.java-version }}
- uses: olafurpg/setup-scala@v13
+ uses: actions/setup-java@v3
with:
java-version: ${{ matrix.java-version }}
+ distribution: temurin
- name: Cache Coursier cache
uses: coursier/cache-action@v6.4.0
diff --git a/.github/workflows/integration-tests-kafka.yml b/.github/workflows/integration-tests-kafka.yml
index 76fb531..7d395cc 100644
--- a/.github/workflows/integration-tests-kafka.yml
+++ b/.github/workflows/integration-tests-kafka.yml
@@ -15,10 +15,10 @@ jobs:
fail-fast: false
matrix:
include:
- - { java-version: adopt@1.8, scala-version: 2.13.10, sbt-opts: '' }
- - { java-version: adopt@1.11.0-9, scala-version: 2.13.10, sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
- - { java-version: adopt@1.8, scala-version: 2.12.17, sbt-opts: '' }
- - { java-version: adopt@1.11.0-9, scala-version: 2.12.17, sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
+ - { java-version: 8, scala-version: 2.13.10, sbt-opts: '' }
+ - { java-version: 11, scala-version: 2.13.10, sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
+ - { java-version: 8, scala-version: 2.12.17, sbt-opts: '' }
+ - { java-version: 11, scala-version: 2.12.17, sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
steps:
- name: Checkout
uses: actions/checkout@v3
@@ -32,9 +32,10 @@ jobs:
git checkout scratch
- name: Setup JDK ${{ matrix.java-version }}
- uses: olafurpg/setup-scala@v13
+ uses: actions/setup-java@v3
with:
java-version: ${{ matrix.java-version }}
+ distribution: temurin
- name: Cache Coursier cache
uses: coursier/cache-action@v6.4.0
diff --git a/.github/workflows/integration-tests-slick.yml b/.github/workflows/integration-tests-slick.yml
index 187ea4e..b84abed 100644
--- a/.github/workflows/integration-tests-slick.yml
+++ b/.github/workflows/integration-tests-slick.yml
@@ -15,10 +15,10 @@ jobs:
fail-fast: false
matrix:
include:
- - { java-version: adopt@1.8, scala-version: 2.13.10, sbt-opts: '' }
- - { java-version: adopt@1.11.0-9, scala-version: 2.13.10, sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
- - { java-version: adopt@1.8, scala-version: 2.12.17, sbt-opts: '' }
- - { java-version: adopt@1.11.0-9, scala-version: 2.12.17, sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
+ - { java-version: 8, scala-version: 2.13.10, sbt-opts: '' }
+ - { java-version: 11, scala-version: 2.13.10, sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
+ - { java-version: 8, scala-version: 2.12.17, sbt-opts: '' }
+ - { java-version: 11, scala-version: 2.12.17, sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
steps:
- name: Checkout
uses: actions/checkout@v3
@@ -36,9 +36,10 @@ jobs:
cp container-license-acceptance.txt slick/src/it/resources/container-license-acceptance.txt
- name: Setup JDK ${{ matrix.java-version }}
- uses: olafurpg/setup-scala@v13
+ uses: actions/setup-java@v3
with:
java-version: ${{ matrix.java-version }}
+ distribution: temurin
- name: Cache Coursier cache
uses: coursier/cache-action@v6.4.0
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1162182..c1d1e1b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -29,7 +29,10 @@ jobs:
git checkout scratch
- name: Setup Scala with JDK 8
- uses: olafurpg/setup-scala@v13
+ uses: actions/setup-java@v3
+ with:
+ java-version: 8
+ distribution: temurin
- name: Cache Coursier cache
uses: coursier/cache-action@v6.4.0
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 276df56..beef2f6 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -15,10 +15,10 @@ jobs:
fail-fast: false
matrix:
include:
- - { java-version: adopt@1.8, scala-version: 2.13.10, sbt-opts: '' }
- - { java-version: adopt@1.11.0-9, scala-version: 2.13.10, sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
- - { java-version: adopt@1.8, scala-version: 2.12.17, sbt-opts: '' }
- - { java-version: adopt@1.11.0-9, scala-version: 2.12.17, sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
+ - { java-version: 8, scala-version: 2.13.10, sbt-opts: '' }
+ - { java-version: 11, scala-version: 2.13.10, sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
+ - { java-version: 8, scala-version: 2.12.17, sbt-opts: '' }
+ - { java-version: 11, scala-version: 2.12.17, sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
steps:
- name: Checkout
uses: actions/checkout@v3
@@ -32,9 +32,10 @@ jobs:
git checkout scratch
- name: Setup JDK ${{ matrix.java-version }}
- uses: olafurpg/setup-scala@v13
+ uses: actions/setup-java@v3
with:
java-version: ${{ matrix.java-version }}
+ distribution: temurin
- name: Cache Coursier cache
uses: coursier/cache-action@v6.4.0
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org