Skip to content

Commit fe1b136

Browse files
author
Stefan Botez
committed
Include RIC pr target in GitHub action
1 parent d616725 commit fe1b136

File tree

5 files changed

+38
-26
lines changed

5 files changed

+38
-26
lines changed

.github/workflows/maven-build-all.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ jobs:
3131
run: mvn -B package --file aws-lambda-java-events-sdk-transformer/pom.xml
3232
- name: Build log4j2 with Maven
3333
run: mvn -B package --file aws-lambda-java-log4j2/pom.xml
34-
- name: Build serialization with Maven
35-
run: mvn -B package --file aws-lambda-java-serialization/pom.xml
36-
- name: Build runtime-interface-client with Maven
37-
run: mvn -B package --file aws-lambda-java-runtime-interface-client/pom.xml
34+
35+
# Test Runtime Interface Client
36+
- name: Run 'pr' target
37+
working-directory: ./aws-lambda-java-runtime-interface-client
38+
run: make pr

aws-lambda-java-runtime-interface-client/src/main/jni/Dockerfile.glibc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
# we use centos 6 to build against glibc 2.12
2-
FROM centos:6
1+
# we use centos 7 to build against glibc 2.12
2+
FROM centos:7
33

44
# aws-lambda-cpp requires cmake3, it's available in EPEL
55
RUN yum install -y epel-release
66
RUN yum install -y \
77
cmake3 \
8+
make \
89
gcc \
910
gcc-c++ \
1011
glibc-devel \

aws-lambda-java-runtime-interface-client/src/test/java/com/amazonaws/services/lambda/runtime/api/client/CustomerClassLoaderTest.java

Lines changed: 29 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -95,24 +95,35 @@ private List<String> strip(String base, URL[] urls) {
9595
@Test
9696
@DisabledOnOs(MAC) // test fails on systems with case-insensitive volumes
9797
public void customerClassLoaderFunction() throws IOException {
98-
Path rootDir = fakeFileSystem(EXAMPLE_FUNCTION);
99-
100-
URLClassLoader customerClassLoader = new CustomerClassLoader(
101-
rootDir.resolve("user/path").toString(),
102-
rootDir.resolve("opt/java").toString(),
103-
ClassLoader.getSystemClassLoader());
104-
105-
List<String> res = strip("file:" + rootDir.toString(), customerClassLoader.getURLs());
106-
107-
Assertions.assertEquals(Arrays.asList(
108-
"/user/path/",
109-
"/user/path/lib/4.jar",
110-
"/user/path/lib/A.jar",
111-
"/user/path/lib/a.jar",
112-
"/user/path/lib/b.jar",
113-
"/user/path/lib/z.jar",
114-
"/user/path/lib/λ.jar"),
115-
res);
98+
try {
99+
Path rootDir = fakeFileSystem(EXAMPLE_FUNCTION);
100+
101+
URLClassLoader customerClassLoader = new CustomerClassLoader(
102+
rootDir.resolve("user/path").toString(),
103+
rootDir.resolve("opt/java").toString(),
104+
ClassLoader.getSystemClassLoader());
105+
106+
List<String> res = strip("file:" + rootDir.toString(), customerClassLoader.getURLs());
107+
108+
Assertions.assertEquals(Arrays.asList(
109+
"/user/path/",
110+
"/user/path/lib/4.jar",
111+
"/user/path/lib/A.jar",
112+
"/user/path/lib/a.jar",
113+
"/user/path/lib/b.jar",
114+
"/user/path/lib/z.jar",
115+
"/user/path/lib/λ.jar"),
116+
res);
117+
} catch(Throwable t) {
118+
// this system property is the name of the charset used when encoding/decoding file paths
119+
// exception is expected if it is not set to a UTF variant
120+
if (!System.getProperty("sun.jnu.encoding").toLowerCase().contains("utf")){
121+
Assertions.assertTrue(t.getMessage().contains("Malformed input or input contains unmappable characters"));
122+
}
123+
else {
124+
throw t;
125+
}
126+
}
116127
}
117128

118129
@Test

aws-lambda-java-runtime-interface-client/test/integration/codebuild-local/codebuild_build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ then
9595
exit 1
9696
fi
9797

98-
docker_command="docker run -it "
98+
docker_command="docker run "
9999
if isOSWindows
100100
then
101101
docker_command+="-v //var/run/docker.sock:/var/run/docker.sock -e "

aws-lambda-java-runtime-interface-client/test/integration/codebuild/buildspec.os.centos.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ batch:
1515
env:
1616
variables:
1717
DISTRO_VERSION:
18-
- "6"
1918
- "7"
2019
- "8"
2120
RUNTIME_VERSION:

0 commit comments

Comments
 (0)