Skip to content

Commit df6f720

Browse files
Try fixing the Buildkite issues
1 parent 63a34bc commit df6f720

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

build.gradle

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

8888
compileThrift {
8989
dependsOn updateDlsSubmodule
90-
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
90+
verbose true
91+
sourceItems "./src/main/idls/thrift/cadence.thrift","./src/main/idls/thrift/shared.thrift","./src/main/idls/thrift/shadower.thrift"
9392
}
9493

9594
compileJava {

docker/buildkite/Dockerfile

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
FROM adoptopenjdk/openjdk11:alpine
1+
FROM adoptopenjdk/openjdk11@sha256:13475f4be7d6701a2ebd0516c4c929f2fa78ea773b4483bb580a36a04975e9f9
22

33
# Apache Thrift version
4-
ENV APACHE_THRIFT_VERSION=0.9.3
4+
ENV APACHE_THRIFT_VERSION=0.13.0
55

66
# Install dependencies using apk
77
RUN apk update && apk add --virtual wget ca-certificates wget && apk add --virtual build-dependencies build-base gcc
@@ -10,13 +10,16 @@ RUN apk add git libstdc++
1010

1111
# Compile source
1212
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}
13+
wget https://downloads.apache.org/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+
touch config.h && \
19+
make && \
20+
make install && \
21+
cd .. && \
22+
rm -rf thrift-${APACHE_THRIFT_VERSION}
2023

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

0 commit comments

Comments
 (0)