This is an automated email from the ASF dual-hosted git repository.
fanningpj pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/pekko-persistence-r2dbc.git
The following commit(s) were added to refs/heads/main by this push:
new d4c096d simplify build by merging scala3 sections with scala2 ones
(#132)
d4c096d is described below
commit d4c096df32c1c123e2228a38d26fb461488c483a
Author: PJ Fanning <[email protected]>
AuthorDate: Sun Jun 30 16:28:41 2024 +0100
simplify build by merging scala3 sections with scala2 ones (#132)
* simplify build by merging scala3 sections with scala2 ones
* test with java 21
* update sbt-pekko-build due to fix for 1.0.x support
---
.github/workflows/build-test.yml | 74 ++--------------------------
.github/workflows/nightly-tests-pekko1.0.yml | 70 ++------------------------
project/plugins.sbt | 2 +-
project/project-info.conf | 2 +-
4 files changed, 10 insertions(+), 138 deletions(-)
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 982e690..f4a8649 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -9,12 +9,12 @@ on:
jobs:
compile:
- name: Test and compile (scala 2.12/2.13)
+ name: Test and compile
runs-on: ubuntu-latest
strategy:
matrix:
- SCALA_VERSION: [ 2.12, 2.13 ]
- JAVA_VERSION: [ 8, 11, 17 ]
+ SCALA_VERSION: [ 2.12, 2.13, 3.3 ]
+ JAVA_VERSION: [ 8, 11, 17, 21 ]
steps:
- name: Checkout
uses: actions/checkout@v4
@@ -37,37 +37,12 @@ jobs:
- name: Compile and test for JDK ${{ matrix.JAVA_VERSION }}, Scala ${{
matrix.SCALA_VERSION }}
run: sbt ++${{ matrix.SCALA_VERSION }} test:compile
- compile3:
- name: Test and compile (scala 3)
- runs-on: ubuntu-latest
- steps:
- - name: Checkout
- uses: actions/checkout@v4
- with:
- fetch-depth: 0
- fetch-tags: true
-
- - name: Setup Java 8
- uses: actions/setup-java@v4
- with:
- distribution: temurin
- java-version: 8
-
- - name: Cache Coursier cache
- uses: coursier/cache-action@v6
-
- - name: Enable jvm-opts
- run: cp .jvmopts-ci .jvmopts
-
- - name: Compile
- run: sbt ++3.3 projection/Test/compile
-
test-postgres:
name: Run test with Postgres
runs-on: ubuntu-latest
strategy:
matrix:
- SCALA_VERSION: [ 2.12, 2.13 ]
+ SCALA_VERSION: [ 2.12, 2.13, 3.3 ]
JAVA_VERSION: [ 8, 11 ]
if: github.repository == 'apache/pekko-persistence-r2dbc'
steps:
@@ -105,51 +80,12 @@ jobs:
- name: test
run: sbt ++${{ matrix.SCALA_VERSION }} test
- test-postgres-scala3:
- name: Run test with Postgres (Scala 3)
- runs-on: ubuntu-latest
- if: github.repository == 'apache/pekko-persistence-r2dbc'
- steps:
- - name: Checkout
- uses: actions/checkout@v4
- with:
- fetch-depth: 0
- fetch-tags: true
-
- - name: Checkout GitHub merge
- if: github.event.pull_request
- run: |-
- git fetch origin pull/${{ github.event.pull_request.number
}}/merge:scratch
- git checkout scratch
-
- - name: Setup Java 8
- uses: actions/setup-java@v4
- with:
- distribution: temurin
- java-version: 8
-
- - name: Cache Coursier cache
- uses: coursier/cache-action@v6
-
- - name: Enable jvm-opts
- run: cp .jvmopts-ci .jvmopts
-
- - name: Start DB
- run: |-
- docker-compose -f docker/docker-compose-postgres.yml up -d
- # TODO: could we poll the port instead of sleep?
- sleep 10
- docker exec -i docker-postgres-db-1 psql -U postgres -t <
ddl-scripts/create_tables_postgres.sql
-
- - name: test
- run: sbt ++3.3 core/test
-
test-yugabyte:
name: Run tests with Yugabyte
runs-on: ubuntu-latest
strategy:
matrix:
- SCALA_VERSION: [ 2.12, 2.13 ]
+ SCALA_VERSION: [ 2.12, 2.13, 3.3 ]
JAVA_VERSION: [ 8, 11 ]
if: github.repository == 'apache/pekko-persistence-r2dbc'
steps:
diff --git a/.github/workflows/nightly-tests-pekko1.0.yml
b/.github/workflows/nightly-tests-pekko1.0.yml
index 7740128..6baf6f1 100644
--- a/.github/workflows/nightly-tests-pekko1.0.yml
+++ b/.github/workflows/nightly-tests-pekko1.0.yml
@@ -7,11 +7,11 @@ on:
jobs:
compile:
- name: Test and compile (scala 2.12/2.13)
+ name: Test and compile
runs-on: ubuntu-latest
strategy:
matrix:
- SCALA_VERSION: [ 2.12, 2.13 ]
+ SCALA_VERSION: [ 2.12, 2.13, 3.3 ]
JAVA_VERSION: [ 8 ]
steps:
- name: Checkout
@@ -35,37 +35,12 @@ jobs:
- name: Compile and test for JDK ${{ matrix.JAVA_VERSION }}, Scala ${{
matrix.SCALA_VERSION }}
run: sbt -Dpekko.build.pekko.version=1.0.x ++${{ matrix.SCALA_VERSION
}} test:compile
- compile3:
- name: Test and compile (scala 3)
- runs-on: ubuntu-latest
- steps:
- - name: Checkout
- uses: actions/checkout@v4
- with:
- fetch-depth: 0
- fetch-tags: true
-
- - name: Setup Java 8
- uses: actions/setup-java@v4
- with:
- distribution: temurin
- java-version: 8
-
- - name: Cache Coursier cache
- uses: coursier/cache-action@v6
-
- - name: Enable jvm-opts
- run: cp .jvmopts-ci .jvmopts
-
- - name: Compile
- run: sbt -Dpekko.build.pekko.version=1.0.x ++3.3
projection/Test/compile
-
test-postgres:
name: Run test with Postgres
runs-on: ubuntu-latest
strategy:
matrix:
- SCALA_VERSION: [ 2.12, 2.13 ]
+ SCALA_VERSION: [ 2.12, 2.13, 3.3 ]
JAVA_VERSION: [ 8 ]
if: github.repository == 'apache/pekko-persistence-r2dbc'
steps:
@@ -102,42 +77,3 @@ jobs:
- name: test
run: sbt -Dpekko.build.pekko.version=1.0.x ++${{ matrix.SCALA_VERSION
}} test
-
- test-postgres-scala3:
- name: Run test with Postgres (Scala 3)
- runs-on: ubuntu-latest
- if: github.repository == 'apache/pekko-persistence-r2dbc'
- steps:
- - name: Checkout
- uses: actions/checkout@v4
- with:
- fetch-depth: 0
- fetch-tags: true
-
- - name: Checkout GitHub merge
- if: github.event.pull_request
- run: |-
- git fetch origin pull/${{ github.event.pull_request.number
}}/merge:scratch
- git checkout scratch
-
- - name: Setup Java 8
- uses: actions/setup-java@v4
- with:
- distribution: temurin
- java-version: 8
-
- - name: Cache Coursier cache
- uses: coursier/cache-action@v6
-
- - name: Enable jvm-opts
- run: cp .jvmopts-ci .jvmopts
-
- - name: Start DB
- run: |-
- docker-compose -f docker/docker-compose-postgres.yml up -d
- # TODO: could we poll the port instead of sleep?
- sleep 10
- docker exec -i docker-postgres-db-1 psql -U postgres -t <
ddl-scripts/create_tables_postgres.sql
-
- - name: test
- run: sbt -Dpekko.build.pekko.version=1.0.x ++3.3 core/test
diff --git a/project/plugins.sbt b/project/plugins.sbt
index de90594..349915e 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -15,7 +15,7 @@ addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0")
// for releasing
addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1")
addSbtPlugin("net.bzzt" % "sbt-reproducible-builds" % "0.32")
-addSbtPlugin("com.github.pjfanning" % "sbt-pekko-build" % "0.3.3")
+addSbtPlugin("com.github.pjfanning" % "sbt-pekko-build" % "0.3.4")
addSbtPlugin("com.github.pjfanning" % "sbt-source-dist" % "0.1.12")
addSbtPlugin("com.github.sbt" % "sbt-license-report" % "1.6.1")
diff --git a/project/project-info.conf b/project/project-info.conf
index 8c001fd..84ce36a 100644
--- a/project/project-info.conf
+++ b/project/project-info.conf
@@ -1,7 +1,7 @@
project-info {
version: "current"
shared-info {
- jdk-versions: ["OpenJDK 8", "OpenJDK 11", "OpenJDK 17"]
+ jdk-versions: ["OpenJDK 8", "OpenJDK 11", "OpenJDK 17", "OpenJDK 21"]
issues: {
url: "https://github.com/apache/pekko-persistence-r2dbc/issues";
text: "Github issues"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
