From 3ed171ea3665be0262a9f3da643faa6f739823b8 Mon Sep 17 00:00:00 2001 From: Ender Demirkaya Date: Tue, 13 Jul 2021 08:37:29 -0700 Subject: [PATCH 1/3] Try fixing the Buildkite issues --- build.gradle | 5 ++--- docker/buildkite/Dockerfile | 19 +++++++++++-------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index 9ec15bbf9..69c4e375b 100644 --- a/build.gradle +++ b/build.gradle @@ -87,9 +87,8 @@ task updateDlsSubmodule(type: Exec) { compileThrift { dependsOn updateDlsSubmodule - sourceItems "${projectDir}/src/main/idls/thrift/cadence.thrift","${projectDir}/src/main/idls/thrift/shared.thrift","${projectDir}/src/main/idls/thrift/shadower.thrift" - - nowarn true + verbose true + sourceItems "./src/main/idls/thrift/cadence.thrift","./src/main/idls/thrift/shared.thrift","./src/main/idls/thrift/shadower.thrift" } compileJava { diff --git a/docker/buildkite/Dockerfile b/docker/buildkite/Dockerfile index 44ec307ef..43fc8f5bd 100644 --- a/docker/buildkite/Dockerfile +++ b/docker/buildkite/Dockerfile @@ -1,4 +1,4 @@ -FROM adoptopenjdk/openjdk11:alpine +FROM adoptopenjdk/openjdk11@sha256:13475f4be7d6701a2ebd0516c4c929f2fa78ea773b4483bb580a36a04975e9f9 # Apache Thrift version ENV APACHE_THRIFT_VERSION=0.9.3 @@ -10,13 +10,16 @@ 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 && \ + touch config.h && \ + 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/* From 5e668454e8de312587e2c9addef9be667a7cdc1b Mon Sep 17 00:00:00 2001 From: Ender Demirkaya Date: Tue, 13 Jul 2021 22:10:44 -0700 Subject: [PATCH 2/3] Address comments --- build.gradle | 2 +- docker/buildkite/Dockerfile | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 69c4e375b..14b7e8ec9 100644 --- a/build.gradle +++ b/build.gradle @@ -88,7 +88,7 @@ task updateDlsSubmodule(type: Exec) { compileThrift { dependsOn updateDlsSubmodule verbose true - sourceItems "./src/main/idls/thrift/cadence.thrift","./src/main/idls/thrift/shared.thrift","./src/main/idls/thrift/shadower.thrift" + sourceItems "${projectDir}/src/main/idls/thrift/cadence.thrift","${projectDir}/src/main/idls/thrift/shared.thrift","${projectDir}/src/main/idls/thrift/shadower.thrift" } compileJava { diff --git a/docker/buildkite/Dockerfile b/docker/buildkite/Dockerfile index 43fc8f5bd..df6cfa8be 100644 --- a/docker/buildkite/Dockerfile +++ b/docker/buildkite/Dockerfile @@ -1,3 +1,6 @@ +# 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@sha256:13475f4be7d6701a2ebd0516c4c929f2fa78ea773b4483bb580a36a04975e9f9 # Apache Thrift version From 49b08f8623c8405cbfcee87853f77ad983f18a9c Mon Sep 17 00:00:00 2001 From: Ender Demirkaya Date: Tue, 13 Jul 2021 22:40:30 -0700 Subject: [PATCH 3/3] Try using a version number instead of a commit hash --- docker/buildkite/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docker/buildkite/Dockerfile b/docker/buildkite/Dockerfile index df6cfa8be..47445f15e 100644 --- a/docker/buildkite/Dockerfile +++ b/docker/buildkite/Dockerfile @@ -1,7 +1,7 @@ # 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@sha256:13475f4be7d6701a2ebd0516c4c929f2fa78ea773b4483bb580a36a04975e9f9 +FROM adoptopenjdk/openjdk11:jdk-11.0.10_9-alpine # Apache Thrift version ENV APACHE_THRIFT_VERSION=0.9.3 @@ -18,7 +18,6 @@ RUN set -ex ;\ 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 && \ - touch config.h && \ make && \ make install && \ cd .. && \