Skip to content

Commit 5008365

Browse files
Fix Java Client Build (#625)
1 parent 63a34bc commit 5008365

File tree

2 files changed

+14
-10
lines changed

2 files changed

+14
-10
lines changed

build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,8 @@ task updateDlsSubmodule(type: Exec) {
8787

8888
compileThrift {
8989
dependsOn updateDlsSubmodule
90+
verbose true
9091
sourceItems "${projectDir}/src/main/idls/thrift/cadence.thrift","${projectDir}/src/main/idls/thrift/shared.thrift","${projectDir}/src/main/idls/thrift/shadower.thrift"
91-
92-
nowarn true
9392
}
9493

9594
compileJava {

docker/buildkite/Dockerfile

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
FROM adoptopenjdk/openjdk11:alpine
1+
# Always use a release version or a specific commit hash below. Don't use
2+
# a branch name since we'd keep getting updates as long as there are new
3+
# commits to that branch and one of them can break the build
4+
FROM adoptopenjdk/openjdk11:jdk-11.0.10_9-alpine
25

36
# Apache Thrift version
47
ENV APACHE_THRIFT_VERSION=0.9.3
@@ -10,13 +13,15 @@ RUN apk add git libstdc++
1013

1114
# Compile source
1215
RUN set -ex ;\
13-
wget http://www-us.apache.org/dist/thrift/${APACHE_THRIFT_VERSION}/thrift-${APACHE_THRIFT_VERSION}.tar.gz ;\
14-
tar -xvf thrift-${APACHE_THRIFT_VERSION}.tar.gz ;\
15-
rm thrift-${APACHE_THRIFT_VERSION}.tar.gz ;\
16-
cd thrift-${APACHE_THRIFT_VERSION}/ ;\
17-
./configure --enable-libs=no --enable-tests=no --enable-tutorial=no --with-cpp=no --with-c_glib=no --with-java=yes --with-ruby=no --with-erlang=no --with-go=no --with-nodejs=no --with-python=no ;\
18-
make -j2 && make install ;\
19-
cd .. && rm -rf thrift-${APACHE_THRIFT_VERSION}
16+
wget https://downloads.apache.org/thrift/${APACHE_THRIFT_VERSION}/thrift-${APACHE_THRIFT_VERSION}.tar.gz && \
17+
tar -xvf thrift-${APACHE_THRIFT_VERSION}.tar.gz && \
18+
rm thrift-${APACHE_THRIFT_VERSION}.tar.gz && \
19+
cd thrift-${APACHE_THRIFT_VERSION}/ && \
20+
./configure --enable-libs=no --enable-tests=no --enable-tutorial=no --with-cpp=no --with-c_glib=no --with-java=yes --with-ruby=no --with-erlang=no --with-go=no --with-nodejs=no --with-python=no && \
21+
make && \
22+
make install && \
23+
cd .. && \
24+
rm -rf thrift-${APACHE_THRIFT_VERSION}
2025

2126
# Cleanup packages and remove cache
2227
RUN apk del build-dependencies wget && rm -rf /var/cache/apk/*

0 commit comments

Comments
 (0)