Skip to content

Commit

Permalink
use sbt-pekko-build
Browse files Browse the repository at this point in the history
temporarily test with pekko main snapshot

Update build.sbt

logback issue

sbt-pekko-build 1.0.2

add nightly job

Update nightly-pekko-1.1-builds.yaml

Update nightly-pekko-1.1-builds.yaml

multiple jdks

temp run for pull request

Update KinesisTest.java

Update nightly-pekko-1.1-builds.yaml

Update nightly-pekko-1.1-builds.yaml

deprecation issue

Update DirectoryChangesSource.java

Update nightly-pekko-1.1-builds.yaml

Revert "Update DirectoryChangesSource.java"

This reverts commit 1b1932a.

Revert "deprecation issue"

This reverts commit 2b41b26.

Revert "Update KinesisTest.java"

This reverts commit a7c472f.

Revert "temp run for pull request"

This reverts commit c92b62d.
  • Loading branch information
pjfanning committed Dec 23, 2023
1 parent db68998 commit 1540677
Show file tree
Hide file tree
Showing 10 changed files with 61 additions and 11 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/check-build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
fetch-depth: 0

- name: Setup Java 8
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 8
Expand All @@ -53,7 +53,7 @@ jobs:
fetch-depth: 0

- name: Setup Java 11
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 11
Expand Down Expand Up @@ -135,7 +135,7 @@ jobs:
fetch-depth: 0

- name: Setup Java 8
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 8
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/headers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
fetch-depth: 0

- name: Setup Java 8
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 8
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/link-validator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
fetch-depth: 0

- name: Setup Java 11
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 11
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly-builds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
fetch-depth: 0

- name: Setup Java 8
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 8
Expand Down
43 changes: 43 additions & 0 deletions .github/workflows/nightly-pekko-1.1-builds.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: Nightly Pekko 1.1 Builds

on:
schedule:
- cron: "0 0 * * *"
workflow_dispatch:

permissions: {}

concurrency:
# Only run once for latest commit per ref and cancel other (previous) runs.
group: pekko-1.1-${{ github.ref }}
cancel-in-progress: true

jobs:
test-compile:
name: Compile
runs-on: ubuntu-20.04
strategy:
fail-fast: false
matrix:
JDK: [ 8, 11 ]
env:
JAVA_OPTS: -Xms2G -Xmx2G -Xss2M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8

steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-tags: true
fetch-depth: 0

- name: Setup Java ${{ matrix.JDK }}
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: ${{ matrix.JDK }}

- name: Cache Coursier cache
uses: coursier/cache-action@v6.4.0

- name: "compile, including tests. Run locally with: sbt -Dpekko.build.pekko.version=main +Test/compile"
run: sbt -Dpekko.build.pekko.version=main +Test/compile
2 changes: 1 addition & 1 deletion .github/workflows/publish-1.0-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
fetch-depth: 0

- name: Setup Java 8
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 8
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
fetch-depth: 0

- name: Setup Java 8
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 8
Expand Down
3 changes: 3 additions & 0 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import net.bzzt.reproduciblebuilds.ReproducibleBuildsPlugin.reproducibleBuildsCh
ThisBuild / apacheSonatypeProjectProfile := "pekko"
sourceDistName := "apache-pekko-connectors"
sourceDistIncubating := true
ThisBuild / resolvers += Resolver.ApacheMavenSnapshotsRepo

commands := commands.value.filterNot { command =>
command.nameOption.exists { name =>
Expand Down Expand Up @@ -470,6 +471,8 @@ def internalProject(projectId: String, additionalSettings: sbt.Def.SettingsDefin
Global / onLoad := (Global / onLoad).value.andThen { s =>
val v = version.value
val log = sLog.value
log.info(
s"Building Pekko Connectors $v against Pekko ${Dependencies.PekkoVersion} on Scala ${(googleCommon / scalaVersion).value}")
if (dynverGitDescribeOutput.value.hasNoTags)
log.error(
s"Failed to derive version from git tags. Maybe run `git fetch --unshallow` or `git fetch upstream` on a fresh git clone from a fork? Derived version: $v")
Expand Down
9 changes: 6 additions & 3 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import sbt._
import Common.isScala3
import Keys._
import com.github.pjfanning.pekkobuild.PekkoDependency

object Dependencies {

Expand All @@ -20,8 +21,8 @@ object Dependencies {
val Scala3 = "3.3.1"
val ScalaVersions = Seq(Scala213, Scala212, Scala3)

val PekkoVersion = "1.0.2"
val PekkoBinaryVersion = "1.0"
val PekkoVersion = PekkoDependency.pekkoVersionDerivedFromDefault("1.0.2")
val PekkoBinaryVersion = PekkoVersion.take(3)

val InfluxDBJavaVersion = "2.15"

Expand All @@ -40,6 +41,8 @@ object Dependencies {
val hoverflyVersion = "0.14.1"
val scalaCheckVersion = "1.16.0"

val LogbackVersion = if (PekkoBinaryVersion == "1.0") "1.2.13" else "1.3.14"

/**
* Calculates the scalatest version in a format that is used for `org.scalatestplus` scalacheck artifacts
*
Expand Down Expand Up @@ -72,7 +75,7 @@ object Dependencies {
"org.apache.pekko" %% "pekko-stream" % PekkoVersion,
"org.apache.pekko" %% "pekko-stream-testkit" % PekkoVersion,
"org.apache.pekko" %% "pekko-slf4j" % PekkoVersion,
"ch.qos.logback" % "logback-classic" % "1.2.13",
"ch.qos.logback" % "logback-classic" % LogbackVersion,
"org.scalatest" %% "scalatest" % ScalaTestVersion,
"com.dimafeng" %% "testcontainers-scala-scalatest" % TestContainersScalaTestVersion,
"com.novocode" % "junit-interface" % "0.11",
Expand Down
1 change: 1 addition & 0 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")
addSbtPlugin("net.bzzt" % "sbt-reproducible-builds" % "0.31")
addSbtPlugin("org.mdedetrich" % "sbt-apache-sonatype" % "0.1.10")
addSbtPlugin("com.github.pjfanning" % "sbt-source-dist" % "0.1.11")
addSbtPlugin("com.github.pjfanning" % "sbt-pekko-build" % "0.1.1")
addSbtPlugin("com.github.sbt" % "sbt-license-report" % "1.6.1")
// discipline
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.9.0")
Expand Down

0 comments on commit 1540677

Please sign in to comment.