Skip to content

Commit

Permalink
chore: static features for async-compression deps (#14711)
Browse files Browse the repository at this point in the history
fix: update async-compression
  • Loading branch information
everpcpc authored Feb 23, 2024
1 parent 5d06510 commit e845de9
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 7 deletions.
8 changes: 6 additions & 2 deletions .github/actions/build_linux/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,12 @@ runs:
done
ls -lh ./target/${{ inputs.target }}/${{ env.BUILD_PROFILE }}/databend-$artifact
- shell: bash
run: readelf -p .comment ./target/${{ inputs.target }}/${{ env.BUILD_PROFILE }}/databend-query
- name: Check Binary Info
shell: bash
continue-on-error: true
run: |
readelf -p .comment ./target/${{ inputs.target }}/${{ env.BUILD_PROFILE }}/databend-query
ldd ./target/${{ inputs.target }}/${{ env.BUILD_PROFILE }}/databend-query
# - name: Compress Binaries with UPX
# if: env.BUILD_PROFILE == 'debug'
Expand Down
4 changes: 3 additions & 1 deletion .github/actions/build_linux_sanitizer/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,10 @@ runs:
done
ls -lh ./target/${{ inputs.target }}/${{ env.BUILD_PROFILE }}/databend-*
- name: Read elf
- name: Check Binary Info
if: env.BUILD_PROFILE == 'debug' && endsWith(inputs.target, '-gnu')
shell: bash
continue-on-error: true
run: |
readelf -p .comment ./target/${{ inputs.target }}/${{ env.BUILD_PROFILE }}/databend-query
ldd ./target/${{ inputs.target }}/${{ env.BUILD_PROFILE }}/databend-query
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion docker/build-tool/base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,14 @@ RUN chmod +x /build/scripts/setup/dev_setup.sh && \

RUN ln -s $(readlink -f `which javac` | sed "s:/bin/javac::") /opt/java

RUN curl -sSfLo /tmp/mold.tar.gz https://github.com/rui314/mold/releases/download/v2.0.0/mold-2.0.0-$(uname -m)-linux.tar.gz && \
RUN curl -sSfLo /tmp/mold.tar.gz https://github.com/rui314/mold/releases/download/v2.4.0/mold-2.4.0-$(uname -m)-linux.tar.gz && \
tar --strip-components=1 -xzf /tmp/mold.tar.gz -C /usr/local && \
rm -rf /tmp/mold.tar.gz && \
ln -sf /usr/local/bin/mold /usr/bin/$(uname -m)-linux-gnu-ld

ENV LIBZ_SYS_STATIC=1
ENV LZMA_API_STATIC=1

ENV JAVA_HOME /opt/java
ENV LD_LIBRARY_PATH /opt/java/lib/server
ENV RUSTUP_HOME /opt/rust/rustup
Expand Down
1 change: 0 additions & 1 deletion scripts/setup/dev_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -630,7 +630,6 @@ fi

if [[ "$INSTALL_CHECK_TOOLS" == "true" ]]; then
if [[ -f scripts/setup/rust-tools.txt ]]; then
export RUSTFLAGS="-C target-feature=-crt-static"
while read -r tool; do
# Use cargo install to prevent downloading the tools with incompatible GLIBC
cargo install "$tool"
Expand Down
2 changes: 1 addition & 1 deletion src/common/compress/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ edition = { workspace = true }

[dependencies]
# Temp workaround, should come back to tagged version after https://github.com/Nemo157/async-compression/issues/150 resolved.
async-compression = { git = "https://github.com/youngsofun/async-compression", rev = "1568ceafd", features = [
async-compression = { git = "https://github.com/everpcpc/async-compression", rev = "dc81082", features = [
"futures-io",
"all-algorithms",
] }
Expand Down

0 comments on commit e845de9

Please sign in to comment.