Fork all tests. Default to java 11 (#4748)

spotify · Mar 14, 2023 · 377f409 · 377f409
1 parent e133eda
commit 377f409
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 14 deletions.
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -40,16 +40,14 @@ jobs:
           fetch-depth: 0
       - name: cache SBT
         uses: coursier/cache-action@v6
-      - name: Java ${{matrix.java}} setup
+      - name: Java 11 setup
         uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: ${{matrix.java}}
+          java-version: 11
       - run: sbt "++${{matrix.scala}} mimaReportBinaryIssues"
     strategy:
       matrix:
-        java:
-          - 11
         scala:
           - 2.12.17
           - 2.13.8
diff --git a/.github/workflows/it-tests.yml b/.github/workflows/it-tests.yml
@@ -18,11 +18,11 @@ jobs:
           credentials_json: ${{ secrets.GCP_CREDENTIALS }}
       - name: cache SBT
         uses: coursier/cache-action@v6
-      - name: Java 17 setup
+      - name: Java 11 setup
         uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 11
       - name: set JVM opts
         run: scripts/gha_setup.sh
       - run: sbt "IntegrationTest/test"

diff --git a/.github/workflows/populate-it-data.yml b/.github/workflows/populate-it-data.yml
@@ -18,7 +18,7 @@ jobs:
           project_id: data-integration-test
       - name: cache SBT
         uses: coursier/cache-action@v6
-      - name: Java setup
+      - name: Java 11 setup
         uses: actions/setup-java@v3
         with:
           distribution: temurin

diff --git a/.github/workflows/pre-release-check.yml b/.github/workflows/pre-release-check.yml
@@ -20,7 +20,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 11
       - name: set JVM opts
         run: scripts/gha_setup.sh
       - name: Run Dataflow jobs

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,11 +12,11 @@ jobs:
           fetch-depth: 0
       - name: cache SBT
         uses: coursier/cache-action@v6
-      - name: Java 17 setup
+      - name: Java 11 setup
         uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 11
       - uses: olafurpg/setup-gpg@v3
       - name: Publish ${{ github.ref }}
         run: sbt ci-release

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -40,6 +40,8 @@ jobs:
         exclude:
           - scala: 2.12.17
             java: 8
+          - scala: 2.12.17
+            java: 17
   repl-test:
     runs-on: ubuntu-latest
     steps:

diff --git a/.jvmopts b/.jvmopts
@@ -1,5 +1,3 @@
---add-opens java.base/java.util=ALL-UNNAMED
---add-opens java.base/java.lang.invoke=ALL-UNNAMED
 -Dfile.encoding=UTF8
 -Dscio.ignoreVersionWarning=true
 -Dorg.slf4j.simpleLogger.defaultLogLevel=warn

diff --git a/build.sbt b/build.sbt
@@ -260,6 +260,7 @@ val commonSettings = formatSettings ++
       "org.apache.beam" % "beam-sdks-java-io-kafka"
     ),
     resolvers ++= Resolver.sonatypeOssRepos("public"),
+    fork := true,
     javaOptions ++= Seq("-Dscio.ignoreVersionWarning=true") ++
       sys.props.get("bigquery.project").map(project => s"-Dbigquery.project=$project") ++
       sys.props.get("bigquery.secret").map(secret => s"-Dbigquery.secret=$secret"),
@@ -367,8 +368,7 @@ lazy val itSettings = Defaults.itSettings ++
         } else {
           HiddenFileFilter || "*.scala"
         }
-      },
-      fork := true
+      }
     )
   )