Skip to content

Commit 98e2d13

Browse files
committed
remove thrift from github actions and remove one more thrift usage
1 parent 93e18a3 commit 98e2d13

File tree

4 files changed

+1
-76
lines changed

4 files changed

+1
-76
lines changed

.github/workflows/release.yml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,6 @@ jobs:
2424
java-version: '11'
2525
distribution: 'temurin'
2626
cache: 'gradle'
27-
- name: Install necessary tooling
28-
env:
29-
APACHE_THRIFT_VERSION: 0.9.3
30-
run: |
31-
apt-get update && apt-get install -y wget gcc make build-essential git
32-
33-
wget https://archive.apache.org/dist/thrift/${APACHE_THRIFT_VERSION}/thrift-${APACHE_THRIFT_VERSION}.tar.gz && \
34-
tar -xvf thrift-${APACHE_THRIFT_VERSION}.tar.gz && \
35-
rm thrift-${APACHE_THRIFT_VERSION}.tar.gz && \
36-
cd thrift-${APACHE_THRIFT_VERSION}/ && \
37-
./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 && \
38-
make && \
39-
make install && \
40-
cd .. && \
41-
rm -rf thrift-${APACHE_THRIFT_VERSION}
42-
4327
- name: Determine release version
4428
id: vars
4529
run: |

docker/github_actions/Dockerfile

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,6 @@
33
# commits to that branch and one of them can break the build
44
FROM adoptopenjdk/openjdk11:jdk-11.0.10_9-alpine
55

6-
# Apache Thrift version
7-
ENV APACHE_THRIFT_VERSION=0.9.3
8-
9-
# Install dependencies using apk
10-
RUN apk update && apk add --virtual wget ca-certificates wget && apk add --virtual build-dependencies build-base gcc
11-
# Git is needed in order to update the dls submodule
12-
RUN apk add git libstdc++ bash curl
13-
14-
# Compile source
15-
RUN set -ex ;\
16-
wget https://archive.apache.org/dist/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}
25-
266
# Cleanup packages and remove cache
277
RUN apk del build-dependencies wget && rm -rf /var/cache/apk/*
288

scripts/install-thrift-locally-osx.sh

Lines changed: 0 additions & 39 deletions
This file was deleted.

src/main/java/com/uber/cadence/internal/common/WorkflowExecutionUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,7 @@ private static String prettyPrintObject(
601601
return new String((byte[]) object, UTF_8);
602602
}
603603
if (ByteBuffer.class.isAssignableFrom(clz)) {
604-
byte[] bytes = org.apache.thrift.TBaseHelper.byteBufferToByteArray((ByteBuffer) object);
604+
byte[] bytes = ((ByteBuffer) object).array();
605605
return new String(bytes, UTF_8);
606606
}
607607
if (clz.equals(Date.class)) {

0 commit comments

Comments
 (0)