Skip to content

ci: Use setup Java v2 (needed for jdk17) #114

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.

Sign up for GitHub

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

Merged
merged 11 commits into from
Sep 30, 2021
Merged

ci: Use setup Java v2 (needed for jdk17) #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
823f87a
ci: java17
grant Sep 27, 2021
7a94544
ci: use temurin distro
grant Sep 27, 2021
ea881ad
ci: enable 17
grant Sep 27, 2021
72cca18
ci: enable 17 (typo)
grant Sep 27, 2021
5a259a0
ci: disable 17 for now
grant Sep 27, 2021
488608a
ci: disable 17 for background tests
grant Sep 28, 2021
0eeb3b1
ci: enable 17
grant Sep 28, 2021
2e0652d
ci: better jdk version parsing
grant Sep 28, 2021
69ab449
ci: better jdk version parsing
grant Sep 28, 2021
34f2238
ci: minor linting
grant Sep 28, 2021
555dd53
docs: add TODO for disabled java17 tests
grant Sep 30, 2021
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
8 changes: 4 additions & 4 deletions .github/workflows/unit.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ jobs:
strategy:
matrix:
java: [
11.x
# 12.x,
# 13.x
11.x,
17.x
]
steps:
- uses: actions/checkout@v2
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v1
uses: actions/setup-java@v2
with:
java-version: ${{ matrix.java }}
distribution: temurin
- name: Build with Maven
run: (cd functions-framework-api/ && mvn install)
- name: Test
Expand Down
22 changes: 20 additions & 2 deletions invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,14 +353,32 @@ public void stackDriverLogging() throws Exception {
fullTarget("Log"), ImmutableList.of(simpleTestCase, quotingTestCase, exceptionTestCase));
}

private static int getJavaVersion() {
String version = System.getProperty("java.version");
if (version.startsWith("1.")) {
version = version.substring(2, 3);
} else {
int dot = version.indexOf(".");
if (dot != -1) {
version = version.substring(0, dot);
}
} return Integer.parseInt(version);
}

@Test
public void background() throws Exception {
backgroundTest("BackgroundSnoop");
// TODO: Only enable background tests for < 17
if (getJavaVersion() < 17) {
backgroundTest("BackgroundSnoop");
}
}

@Test
public void typedBackground() throws Exception {
backgroundTest("TypedBackgroundSnoop");
// TODO: Only enable background tests for < 17
if (getJavaVersion() < 17) {
backgroundTest("TypedBackgroundSnoop");
}
}

private void backgroundTest(String target) throws Exception {
Expand Down