Merge pull request #427 from greshny-forks/optimize-github-actions

Update Scala versions and Redpanda container image

Author: dimafeng

.github/workflows/ci-release.yml

@@ -17,7 +17,9 @@ jobs:
           distribution: temurin
           java-version: 8
           cache: sbt
-      - run: ./sbt ci-release
+      - name: Setup sbt launcher
+        uses: sbt/setup-sbt@v1
+      - run: sbt ci-release
         env:
           PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
           PGP_SECRET: ${{ secrets.PGP_SECRET }}

.github/workflows/test.yml

@@ -12,11 +12,8 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        java:
-          - 8
-          - 11
-          - 17
-    #          - [email protected]
+        scala: [2.12.20, 2.13.16, 3.3.5]
+        java: [8, 11, 17]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
@@ -44,15 +41,8 @@ jobs:
           java-version: ${{ matrix.java }}
           check-latest: true
           cache: "sbt"
-      - name: Restore cache
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.sbt
-            ~/.ivy2/cache
-            ~/.cache/coursier
-          key: cache-v1-${{ hashFiles('build.sbt') }}
-          restore-keys: |
-            cache-v1-
-      - name: Compile and Test
-        run: ./sbt +test
+
+      - name: Setup sbt launcher
+        uses: sbt/setup-sbt@v1
+
+      - run: sbt ++${{ matrix.scala }} test

build.sbt

@@ -5,8 +5,8 @@ import java.net.URI
 lazy val compileScalastyle = taskKey[Unit]("compileScalastyle")
 
 val commonSettings = Seq(
-  ThisBuild / scalaVersion := "2.12.19",
-  crossScalaVersions := Seq("2.12.19", "2.13.14", "3.3.4"),
+  ThisBuild / scalaVersion := "2.12.20",
+  crossScalaVersions := Seq("2.12.20", "2.13.16", "3.3.5"),
 
   ThisBuild / parallelExecution := false,
   fork := true,

modules/redpanda/src/main/scala/com/dimafeng/testcontainers/RedpandaContainer.scala

@@ -14,7 +14,7 @@ case class RedpandaContainer(
 
 object RedpandaContainer {
 
-  val defaultImage = "docker.redpanda.com/vectorized/redpanda"
+  val defaultImage = "docker.redpanda.com/redpandadata/redpanda"
   val defaultTag = "v22.2.6"
   val defaultDockerImageName = s"$defaultImage:$defaultTag"