Merge 6ec998e into dd07ea8

whylabs · Feb 22, 2022 · 30803ef · 30803ef
2 parents dd07ea8 + 6ec998e
commit 30803ef
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 10 deletions.
diff --git a/.github/workflows/java-continuous-integration.yml b/.github/workflows/java-continuous-integration.yml
@@ -10,6 +10,33 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
+        scala-version: [2.11, 2.12]
+        spark-version: [2.4.7, 2.4.8]
+        include:
+          - os: ubuntu-latest
+            scala-version: 2.12
+            spark-version: 3.0.3
+          - os: ubuntu-latest
+            scala-version: 2.12
+            spark-version: 3.1.1
+          - os: ubuntu-latest
+            scala-version: 2.12
+            spark-version: 3.1.3
+          # build failures
+          #- os: ubuntu-latest
+          #  scala-version: 2.12
+          #  spark-version: 3.2.0
+          #- os: ubuntu-latest
+          #  scala-version: 2.12
+          #  spark-version: 3.2.1
+
+          # s/JavaConversions/CollectionConverts/ deprecation in Scala 2.13
+          #- os: ubuntu-latest
+          #  scala-version: 2.13
+          #  spark-version: 3.2.0
+          #- os: ubuntu-latest
+          #  scala-version: 2.13
+          #  spark-version: 3.2.1
     runs-on: ${{ matrix.os }}
     defaults:
       run:
@@ -37,6 +64,9 @@ jobs:
         with:
           build-root-directory: java
           arguments: build
+        env:
+          SCALA_VERSION : ${{ matrix.scala-version }}
+          SPARK_VERSION : ${{ matrix.spark-version }}
       - name: Smoke test jar in client environment
         uses: gradle/gradle-build-action@v2
         with:

diff --git a/.github/workflows/push_release.yml b/.github/workflows/push_release.yml
@@ -3,13 +3,22 @@ name: Upload Whylogs Packages
 
 on:
   release:
-    types: [ released, prereleased]
+    types: [released, prereleased]
 
 jobs:
   deploy:
-
+    strategy:
+      matrix:
+        scala-version: [2.11, 2.12]
+        spark-version: [2.4.7, 2.4.8]
+        include:
+          - scala-version: 2.12
+            spark-version: 3.0.3
+          - scala-version: 2.12
+            spark-version: 3.1.1
+          - scala-version: 2.12
+            spark-version: 3.1.3
     runs-on: ubuntu-latest
-
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python
@@ -69,6 +78,8 @@ jobs:
       env:
         ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGNING_KEY_ASCII }}
         ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGNING_KEY_PASSWORD }}
+        SCALA_VERSION : ${{ matrix.scala-version }}
+        SPARK_VERSION : ${{ matrix.spark-version }}
       run: ./gradlew publish -PossrhUsername=${{ secrets.NEXUS_TOKEN_USERNAME }} -PossrhPassword=${{ secrets.NEXUS_TOKEN_PASSWORD }}
       working-directory: java
 

diff --git a/.github/workflows/python-continuous-integration.yml b/.github/workflows/python-continuous-integration.yml
@@ -15,8 +15,7 @@ jobs:
       max-parallel: 6
       matrix:
         os: [ubuntu-latest, macOS-latest]
-        python-version: [ 3.6, 3.7, 3.8, 3.9]
-
+        python-version: [3.6, 3.7, 3.8, 3.9]
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}

diff --git a/java/spark-bundle/build.gradle.kts b/java/spark-bundle/build.gradle.kts
@@ -14,8 +14,8 @@ plugins {
     id("com.github.johnrengelman.shadow") version ("5.2.0")
 }
 
-val scalaVersion = project.properties.getOrDefault("scalaVersion", "2.12")
-val sparkVersion = project.properties.getOrDefault("sparkVersion", "3.1.1") as String
+val scalaVersion = System.getenv("SCALA_VERSION")
+val sparkVersion = System.getenv("SPARK_VERSION")
 val artifactBaseName = "whylogs-spark-bundle_${sparkVersion}-scala_$scalaVersion"
 val versionString = rootProject.version
 

diff --git a/java/spark/build.gradle.kts b/java/spark/build.gradle.kts
@@ -19,8 +19,8 @@ spotless {
     }
 }
 
-val scalaVersion = project.properties.getOrDefault("scalaVersion", "2.12")
-val sparkVersion = project.properties.getOrDefault("sparkVersion", "3.1.1") as String
+val scalaVersion = System.getenv("SCALA_VERSION")
+val sparkVersion = System.getenv("SPARK_VERSION")
 val artifactBaseName = "${rootProject.name}-spark_$sparkVersion-scala_$scalaVersion"
 
 tasks.jar {
@@ -32,7 +32,7 @@ tasks.withType<Jar> {
 }
 
 fun scalaPackage(groupId: String, name: String, version: String) =
-    "$groupId:${name}_$scalaVersion:$version"
+    "$groupId:${name}_${scalaVersion}:${version}"
 
 sourceSets {
     main {