Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Scala versions and Redpanda container image #427

Merged
merged 2 commits into from
Mar 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/ci-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
24 changes: 7 additions & 17 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
Loading