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

Fork all tests. Default to java 11 #4748

Merged
merged 1 commit into from
Mar 14, 2023
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
6 changes: 2 additions & 4 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions .github/workflows/it-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/populate-it-data.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pre-release-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 0 additions & 2 deletions .jvmopts
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down Expand Up @@ -367,8 +368,7 @@ lazy val itSettings = Defaults.itSettings ++
} else {
HiddenFileFilter || "*.scala"
}
},
fork := true
}
)
)

Expand Down