Skip to content

Commit 09958e1

Browse files
LoremIPsummerLoremIPsummer
authored
Update Thrift to version 0.16 (#657)
1 parent fb1ceda commit 09958e1

File tree

32 files changed

+1803
-84
lines changed

32 files changed

+1803
-84
lines changed

‎.github/scripts/ubuntu-20.04/compile_build.sh‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Compile dependencies that cannot be acquired via the official repositories
2+
3+
mkdir -p ${INSTALL_PATH}
4+
5+
## Compile Thrift
6+
tar -xvf ${DOWNLOAD_PATH}/thrift-0.16.0.tar.gz
7+
cd thrift-0.16.0
8+
./configure --prefix=${INSTALL_PATH}/thrift --silent --without-python \
9+
--enable-libtool-lock --enable-tutorial=no --enable-tests=no \
10+
--with-libevent --with-zlib --without-nodejs --without-lua \
11+
--without-ruby --without-csharp --without-erlang --without-perl \
12+
--without-php --without-php_extension --without-dart \
13+
--without-haskell --without-go --without-rs --without-haxe \
14+
--without-dotnetcore --without-d --without-qt4 --without-qt5 \
15+
--without-java --without-swift
16+
17+
make install -j $(nproc)

‎.github/scripts/ubuntu-20.04/download_build.sh‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Download installers for compiled dependencies
2+
3+
mkdir -p ${DOWNLOAD_PATH}
4+
5+
## Thrift 0.16
6+
7+
wget -O ${DOWNLOAD_PATH}/thrift-0.16.0.tar.gz "http://archive.apache.org/dist/thrift/0.16.0/thrift-0.16.0.tar.gz"
8+
9+
# Calculate hash of dependencies for Github Cache Action
10+
11+
dependencies_to_hash=("thrift-0.16.0.tar.gz")
12+
13+
concatenated_hashes=""
14+
for file in "${dependencies_to_hash[@]}"; do
15+
file_hash=$(md5sum "${DOWNLOAD_PATH}/${file}" | awk '{print $1}')
16+
concatenated_hashes="${concatenated_hashes}${file_hash}"
17+
done
18+
19+
hash_value=$(echo -n "$concatenated_hashes" | md5sum | awk '{print $1}')
20+
21+
## Save said hash
22+
23+
echo "compile-hash-key=${hash_value}" >> $GITHUB_OUTPUT

‎.github/scripts/ubuntu-20.04/postcompile_build.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Post compilation configuration for building (environmental variables, library location settings etc..)
2+
3+
echo "${INSTALL_PATH}/thrift/bin" >> $GITHUB_PATH
4+
echo "CMAKE_PREFIX_PATH=${INSTALL_PATH}/thrift:$CMAKE_PREFIX_PATH" >> $GITHUB_ENV

‎.github/scripts/setup_build_ubuntu-20.04.sh‎ renamed to ‎.github/scripts/ubuntu-20.04/setup_build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22

33
# Install required packages for CodeCompass build
44
sudo apt-get install -y git cmake make g++ libboost-all-dev llvm-11-dev clang-11 \
5-
libclang-11-dev odb libodb-dev thrift-compiler libthrift-dev default-jdk libssl-dev \
5+
libclang-11-dev odb libodb-dev default-jdk libssl-dev \
66
libgraphviz-dev libmagic-dev libgit2-dev ctags doxygen libgtest-dev npm libldap2-dev

‎.github/scripts/setup_postgresql_ubuntu-20.04.sh‎ renamed to ‎.github/scripts/ubuntu-20.04/setup_postgresql.sh‎

File renamed without changes.

‎.github/scripts/setup_runtime_ubuntu-20.04.sh‎ renamed to ‎.github/scripts/ubuntu-20.04/setup_runtime.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
# Install required packages for CodeCompass runtime
44
sudo apt-get install -y git cmake make g++ graphviz \
55
libboost-filesystem1.71.0 libboost-log1.71.0 libboost-program-options1.71.0 \
6-
libllvm11 clang-11 libclang1-11 libthrift-0.13.0 default-jre libssl1.1 libmagic1 \
6+
libllvm11 clang-11 libclang1-11 default-jre libssl1.1 libmagic1 \
77
libgit2-28 ctags googletest libldap-2.4-2

‎.github/scripts/setup_sqlite3_ubuntu-20.04.sh‎ renamed to ‎.github/scripts/ubuntu-20.04/setup_sqlite3.sh‎

File renamed without changes.

‎.github/workflows/ci.yml‎

Lines changed: 74 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ on: [push, pull_request, workflow_dispatch]
44

55
env:
66
BUILD_TYPE: Debug
7+
## For locally compiled dependencies
8+
INSTALL_PATH: ${{github.workspace}}/dependencies/install
9+
## Temp directory for installers of the downloaded dependencies
10+
DOWNLOAD_PATH: ${{github.workspace}}/dependencies/download
711

812
permissions: read-all
913

@@ -20,6 +24,9 @@ jobs:
2024
fail-fast: false
2125

2226
runs-on: ${{ matrix.os }}
27+
outputs:
28+
has-compiled-dependencies: ${{ steps.compilation-flag.outputs.has-compiled-dependencies }}
29+
compile-hash-key: ${{ steps.download-compile-dependencies.outputs.compile-hash-key }}
2330

2431
services:
2532
# Label used to access the service container
@@ -45,10 +52,56 @@ jobs:
4552
run: sudo apt-get update
4653

4754
- name: Install required packages for build
48-
run: ./.github/scripts/setup_build_${{matrix.os}}.sh
55+
run: ./.github/scripts/${{ matrix.os }}/setup_build.sh
56+
57+
- name: Set has-compiled-dependencies flag
58+
id: compilation-flag
59+
run: |
60+
if [ -f ./.github/scripts/${{ matrix.os }}/compile_build.sh ]; then
61+
echo "has-compiled-dependencies=true" >> "$GITHUB_OUTPUT"
62+
else
63+
echo "has-compiled-dependencies=false" >> "$GITHUB_OUTPUT"
64+
fi
65+
66+
- name: Download installers for compiled dependencies
67+
if: steps.compilation-flag.outputs.has-compiled-dependencies == 'true'
68+
id: download-compile-dependencies
69+
run: |
70+
chmod +x ./.github/scripts/${{ matrix.os }}/download_build.sh
71+
./.github/scripts/${{ matrix.os }}/download_build.sh
72+
73+
- name: Restore compiled dependencies
74+
if: steps.compilation-flag.outputs.has-compiled-dependencies == 'true'
75+
id: restore-compiled-dependencies
76+
uses: actions/cache/restore@v3
77+
with:
78+
path: ${{ env.INSTALL_PATH }}
79+
key: ${{ matrix.os }}-compile-install-${{steps.download-compile-dependencies.outputs.compile-hash-key}}
80+
81+
- name: Compile dependencies
82+
if: steps.restore-compiled-dependencies.outputs.cache-hit != 'true' && steps.compilation-flag.outputs.has-compiled-dependencies == 'true'
83+
run: |
84+
chmod +x ./.github/scripts/${{ matrix.os }}/compile_build.sh
85+
./.github/scripts/${{ matrix.os }}/compile_build.sh
86+
87+
- name: Post compilation configuration (build)
88+
if: steps.compilation-flag.outputs.has-compiled-dependencies == 'true'
89+
run: |
90+
if [ -f ./.github/scripts/${{ matrix.os }}/postcompile_build.sh ]; then
91+
chmod +x ./.github/scripts/${{ matrix.os }}/postcompile_build.sh
92+
./.github/scripts/${{ matrix.os }}/postcompile_build.sh
93+
fi
94+
95+
- name: Save dependencies
96+
if: steps.restore-compiled-dependencies.outputs.cache-hit != 'true' && steps.compilation-flag.outputs.has-compiled-dependencies == 'true'
97+
id: save-compiled-dependencies
98+
uses: actions/cache/save@v3
99+
with:
100+
path: ${{ env.INSTALL_PATH }}
101+
key: ${{ matrix.os }}-compile-install-${{steps.download-compile-dependencies.outputs.compile-hash-key}}
49102

50103
- name: Install database packages
51-
run: ./.github/scripts/setup_${{matrix.db}}_${{matrix.os}}.sh
104+
run: ./.github/scripts/${{ matrix.os }}/setup_${{matrix.db}}.sh
52105

53106
- name: Install GoogleTest
54107
run: |
@@ -79,8 +132,7 @@ jobs:
79132
80133
- name: Configure CMake
81134
working-directory: ${{github.workspace}}
82-
run:
83-
cmake -E make_directory $HOME/cc-build
135+
run: cmake -E make_directory $HOME/cc-build
84136

85137
- name: Run CMake
86138
run: >
@@ -128,7 +180,6 @@ jobs:
128180
name: codecompass-${{ matrix.os }}-${{ matrix.db }}-compiletime
129181
path: ${{github.workspace}}/artifacts/codecompass-${{ matrix.os }}-${{ matrix.db }}-compiletime.zip
130182

131-
132183
## PARSING JOBS
133184
parse:
134185
needs: build
@@ -166,10 +217,26 @@ jobs:
166217

167218
# We need build dependencies for CodeCompass, as it will parsed as well
168219
- name: Install required packages for build
169-
run: ./.github/scripts/setup_build_${{matrix.os}}.sh
220+
run: ./.github/scripts/${{ matrix.os }}/setup_build.sh
170221

171222
- name: Install database packages
172-
run: ./.github/scripts/setup_${{matrix.db}}_${{matrix.os}}.sh
223+
run: ./.github/scripts/${{ matrix.os }}/setup_${{matrix.db}}.sh
224+
225+
- name: Restore compiled dependencies
226+
if: needs.build.outputs.has-compiled-dependencies == 'true'
227+
id: restore-compiled-dependencies
228+
uses: actions/cache/restore@v3
229+
with:
230+
path: ${{ env.INSTALL_PATH }}
231+
key: ${{ matrix.os }}-compile-install-${{needs.build.outputs.compile-hash-key}}
232+
233+
- name: Post compilation configuration (runtime)
234+
if: needs.build.outputs.has-compiled-dependencies == 'true'
235+
run: |
236+
if [ -f ./.github/scripts/${{ matrix.os }}/postcompile_runtime.sh ]; then
237+
chmod +x ./.github/scripts/${{ matrix.os }}/postcompile_runtime.sh
238+
./.github/scripts/${{ matrix.os }}/postcompile_runtime.sh
239+
fi
173240
174241
- name: Download CodeCompass binaries
175242
uses: actions/download-artifact@v2
@@ -241,7 +308,6 @@ jobs:
241308
cd $HOME/cc-install/bin
242309
./CodeCompass_parser -d $PROJ_XERCES_CONNSTRING -w $HOME/$DIR_WS/ -n "Xerces-C" -i $HOME/xerces-c -i $HOME/build_xerces-c/compile_commands.json -j $(nproc)
243310
244-
245311
## DOCKER IMAGE JOB
246312
docker:
247313
needs: parse
@@ -253,7 +319,6 @@ jobs:
253319
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
254320
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
255321

256-
257322
## TARBALL JOB
258323
tarball:
259324
needs: parse

‎.gitlab/build-deps.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -324,9 +324,9 @@ fi
324324
##########
325325

326326
cd $PACKAGES_DIR
327-
wget --no-verbose --no-clobber http://archive.apache.org/dist/thrift/0.13.0/thrift-0.13.0.tar.gz
328-
tar -xf thrift-0.13.0.tar.gz
329-
cd thrift-0.13.0
327+
wget --no-verbose --no-clobber http://archive.apache.org/dist/thrift/0.16.0/thrift-0.16.0.tar.gz
328+
tar -xf thrift-0.16.0.tar.gz
329+
cd thrift-0.16.0
330330

331331
CXXFLAGS="$CXXFLAGS -I$DEPS_INSTALL_RUNTIME_DIR/boost-install/include" \
332332
LDFLAGS="$LDFLAGS -Wl,-rpath-link,$DEPS_INSTALL_RUNTIME_DIR/openssl-install/lib" \
@@ -338,7 +338,7 @@ LDFLAGS="$LDFLAGS -Wl,-rpath-link,$DEPS_INSTALL_RUNTIME_DIR/openssl-install/lib"
338338
--without-python
339339

340340
make install --quiet --jobs $(nproc)
341-
rm -f $PACKAGES_DIR/thrift-0.13.0.tar.gz
341+
rm -f $PACKAGES_DIR/thrift-0.16.0.tar.gz
342342

343343
########
344344
# Java #

‎Functions.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,4 +129,4 @@ function(join _values _glue _output)
129129
string (REGEX REPLACE "([^\\]|^);" "\\1${_glue}" _tmpStr "${_values}")
130130
string (REGEX REPLACE "[\\](.)" "\\1" _tmpStr "${_tmpStr}") #fixes escaping
131131
set (${_output} "${_tmpStr}" PARENT_SCOPE)
132-
endfunction(join)
132+
endfunction(join)

0 commit comments

Comments
 (0)