Skip to content

Fix Java Client Build #625

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 3 commits into from
Jul 14, 2021
Merged

Fix Java Client Build #625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ed171e
Try fixing the Buildkite issues
demirkayaender Jul 13, 2021
5e66845
Address comments
demirkayaender Jul 14, 2021
49b08f8
Try using a version number instead of a commit hash
demirkayaender Jul 14, 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
3 changes: 1 addition & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,8 @@ task updateDlsSubmodule(type: Exec) {

compileThrift {
dependsOn updateDlsSubmodule
verbose true
sourceItems "${projectDir}/src/main/idls/thrift/cadence.thrift","${projectDir}/src/main/idls/thrift/shared.thrift","${projectDir}/src/main/idls/thrift/shadower.thrift"

nowarn true
}

compileJava {
Expand Down
21 changes: 13 additions & 8 deletions docker/buildkite/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
FROM adoptopenjdk/openjdk11:alpine
# Always use a release version or a specific commit hash below. Don't use
# a branch name since we'd keep getting updates as long as there are new
# commits to that branch and one of them can break the build
FROM adoptopenjdk/openjdk11:jdk-11.0.10_9-alpine

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

# Compile source
RUN set -ex ;\
wget http://www-us.apache.org/dist/thrift/${APACHE_THRIFT_VERSION}/thrift-${APACHE_THRIFT_VERSION}.tar.gz ;\
tar -xvf thrift-${APACHE_THRIFT_VERSION}.tar.gz ;\
rm thrift-${APACHE_THRIFT_VERSION}.tar.gz ;\
cd thrift-${APACHE_THRIFT_VERSION}/ ;\
./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 ;\
make -j2 && make install ;\
cd .. && rm -rf thrift-${APACHE_THRIFT_VERSION}
wget https://downloads.apache.org/thrift/${APACHE_THRIFT_VERSION}/thrift-${APACHE_THRIFT_VERSION}.tar.gz && \
tar -xvf thrift-${APACHE_THRIFT_VERSION}.tar.gz && \
rm thrift-${APACHE_THRIFT_VERSION}.tar.gz && \
cd thrift-${APACHE_THRIFT_VERSION}/ && \
./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 && \
make && \
make install && \
cd .. && \
rm -rf thrift-${APACHE_THRIFT_VERSION}

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