Skip to content

Commit

Permalink
Unset the dynamic linking compiler optimizations in precompile (#24195)
Browse files Browse the repository at this point in the history
Since we're building a precompiled binary, we want the full binary
statically linked.

GitOrigin-RevId: 294e35084e3c023caa9b410ddec36155d3e6147d
  • Loading branch information
nipunn1313 authored and Convex, Inc. committed Apr 1, 2024
1 parent aef1781 commit dde0613
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 13 deletions.
12 changes: 0 additions & 12 deletions .github/actions/setup-rust/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,6 @@ runs:
if: runner.os == 'Linux'
run: sudo apt-get install pkg-config libsodium-dev

- name: Install libsodium and pkg-config
shell: bash
env:
HOMEBREW_NO_AUTO_UPDATE: 1
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
if: runner.os == 'MacOS'
run: brew install pkg-config libsodium rocksdb

- name: Install Just
uses: extractions/setup-just@v1
env:
Expand All @@ -49,10 +41,6 @@ runs:
echo "SODIUM_USE_PKG_CONFIG=1" >> $GITHUB_ENV
echo "ROCKSDB_LIB_DIR=/usr/lib" >> $GITHUB_ENV
fi
if [ "$RUNNER_OS" == "MacOS" ]; then
echo "SODIUM_USE_PKG_CONFIG=1" >> $GITHUB_ENV
echo "ROCKSDB_LIB_DIR=$(ls -d /usr/local/Cellar/rocksdb/*/lib)" >> $GITHUB_ENV
fi
echo "SCCACHE_ENDPOINT=https://a4aa0fffebef8bc497f64875c40ee6fb.r2.cloudflarestorage.com" >> $GITHUB_ENV
echo "SCCACHE_BUCKET=cvx-actions-cache" >> $GITHUB_ENV
echo "SCCACHE_REGION=auto" >> $GITHUB_ENV
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/precompile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,11 @@ jobs:
just rush build
- name: Build backend
run: cargo build --release -p local_backend --bin convex-local-backend
run: |
unset ROCKSDB_LIB_DIR
unset SODIUM_USE_PKG_CONFIG
unset SNAPPY_LIB_DIR
cargo build --release -p local_backend --bin convex-local-backend
- name: Zip backend into arch
run: |
Expand Down

0 comments on commit dde0613

Please sign in to comment.