Skip to content

Commit a6d82fe

Browse files
committed
[native] Add clang installation to dependency image and update image
PR prestodb#24479 switched the debug CI build to Clang to save more disk space. Clang is installed as part of the CI steps but it is better to have it present in the dependency image. The other change was made to unblock PRs due to failing CI pipelines. In addition, the dependency image is updated with the change made in this PR.
1 parent 673c80f commit a6d82fe

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

.github/workflows/prestocpp-linux-build.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
prestocpp-linux-build-engine:
1212
runs-on: ubuntu-22.04
1313
container:
14-
image: prestodb/presto-native-dependency:0.291-20250108164449-87d82ed
14+
image: prestodb/presto-native-dependency:0.292-20250204112033-cf8ba84
1515
env:
1616
CCACHE_DIR: "${{ github.workspace }}/ccache"
1717
CC: /usr/bin/clang-15
@@ -51,10 +51,6 @@ jobs:
5151
- name: Disk space consumption before build
5252
run: df
5353

54-
- name: Install Clang
55-
run: |
56-
presto-native-execution/velox/scripts/setup-centos9.sh install_clang15
57-
5854
- name: Build engine
5955
run: |
6056
cd presto-native-execution

presto-native-execution/scripts/dockerfiles/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
55
There are two kinds of Dockerfiles:
66
1) A platform specific file to build dependencies. Current supported platforms are:
7-
1) Centos-8-stream with gcc9.
7+
1) Centos-9-stream with gcc12. Clang15 is also installed.
88
2) Ubuntu-22.04 with gcc11.
99
2) A platform-agnostic file to build Prestissimo runtime on top of the dependency image.
1010
### Dependency Dockerfiles

presto-native-execution/scripts/dockerfiles/centos-dependency.dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,6 @@ COPY velox/scripts /velox/scripts
2222
RUN mkdir build && \
2323
(cd build && ../scripts/setup-centos.sh && \
2424
../velox/scripts/setup-adapters.sh && \
25-
../scripts/setup-adapters.sh ) && \
25+
../scripts/setup-adapters.sh && \
26+
../velox/scripts/setup-centos9.sh install_clang15) && \
2627
rm -rf build

0 commit comments

Comments
 (0)