try to fix CI issue

rocksdict · Dec 13, 2024 · e364332 · e364332
1 parent 0657241
commit e364332
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -40,8 +40,8 @@ jobs:
           export CC=${HOMEBREW_PREFIX}/opt/llvm@19/bin/clang
           export CXX=${HOMEBREW_PREFIX}/opt/llvm@19/bin/clang++
           export AR=${HOMEBREW_PREFIX}/opt/llvm@19/bin/llvm-ar
-          export CFLAGS="-flto=thin -O3 --sysroot=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk"
-          export CXXFLAGS="-flto=thin -O3 --sysroot=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk"
+          export CFLAGS="-flto=thin -O3 -isysroot=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk"
+          export CXXFLAGS="-flto=thin -O3 -isysroot=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk"
           export LLD=${HOMEBREW_PREFIX}/opt/lld/bin/ld64.lld
           export RUSTFLAGS="-Clinker-plugin-lto -Clinker=$PWD/macos-linker.sh -Clink-arg=-fuse-ld=${LLD}"
           maturin build --release --target aarch64-apple-darwin --out dist -i ${{ matrix.py_version }}
@@ -89,7 +89,7 @@ jobs:
         uses: messense/maturin-action@v1
         with:
           target: ${{ matrix.target }}
-          args: --release --out dist
+          args: --release --out dist --no-default-features --features bindgen-static
         env:
           LIBCLANG_PATH: ${{ runner.temp }}/llvm-18.1/lib
           CC: ${{ runner.temp }}/llvm-18.1/bin/clang-cl
@@ -295,7 +295,7 @@ jobs:
           rustup-components: rustfmt
           target: ${{ matrix.target }}
           manylinux: musllinux_1_2
-          args: --release --no-default-features --features bindgen-static --out dist --interpreter '3.7 3.8 3.9 3.10 3.11 3.12 3.13 pypy3.9 pypy3.10'
+          args: --release --no-default-features --features bindgen-static,lto --out dist --interpreter '3.7 3.8 3.9 3.10 3.11 3.12 3.13 pypy3.9 pypy3.10'
           container: congyuwang/musllinux_1_2_x86_64:llvm-19.1.3
           before-script-linux: |
             apk update
@@ -343,7 +343,7 @@ jobs:
           rustup-components: rustfmt
           target: ${{ matrix.target }}
           manylinux: musllinux_1_2
-          args: --release --no-default-features --features bindgen-static --out dist --interpreter '3.7 3.8 3.9 3.10 3.11 3.12 3.13 pypy3.9 pypy3.10'
+          args: --release --no-default-features --features bindgen-static,lto --out dist --interpreter '3.7 3.8 3.9 3.10 3.11 3.12 3.13 pypy3.9 pypy3.10'
           container: congyuwang/musllinux_1_2_aarch64:llvm-19.1.3
           before-script-linux: |
             apk update

diff --git a/.github/workflows/PR.yml b/.github/workflows/PR.yml
@@ -40,8 +40,8 @@ jobs:
           export CC=${HOMEBREW_PREFIX}/opt/llvm@19/bin/clang
           export CXX=${HOMEBREW_PREFIX}/opt/llvm@19/bin/clang++
           export AR=${HOMEBREW_PREFIX}/opt/llvm@19/bin/llvm-ar
-          export CFLAGS="-flto=thin -O3 --sysroot=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk"
-          export CXXFLAGS="-flto=thin -O3 --sysroot=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk"
+          export CFLAGS="-flto=thin -O3 -isysroot=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk"
+          export CXXFLAGS="-flto=thin -O3 -isysroot=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk"
           export LLD=${HOMEBREW_PREFIX}/opt/lld/bin/ld64.lld
           export RUSTFLAGS="-Clinker-plugin-lto -Clinker=$PWD/macos-linker.sh -Clink-arg=-fuse-ld=${LLD}"
           maturin build --release --target aarch64-apple-darwin --out dist -i ${{ matrix.py_version }}
@@ -89,7 +89,7 @@ jobs:
         uses: messense/maturin-action@v1
         with:
           target: ${{ matrix.target }}
-          args: --release --out dist
+          args: --release --out dist --no-default-features --features bindgen-static
         env:
           LIBCLANG_PATH: ${{ runner.temp }}/llvm-18.1/lib
           CC: ${{ runner.temp }}/llvm-18.1/bin/clang-cl
@@ -295,7 +295,7 @@ jobs:
           rustup-components: rustfmt
           target: ${{ matrix.target }}
           manylinux: musllinux_1_2
-          args: --release --no-default-features --features bindgen-static --out dist --interpreter '3.7 3.8 3.9 3.10 3.11 3.12 3.13 pypy3.9 pypy3.10'
+          args: --release --no-default-features --features bindgen-static,lto --out dist --interpreter '3.7 3.8 3.9 3.10 3.11 3.12 3.13 pypy3.9 pypy3.10'
           container: congyuwang/musllinux_1_2_x86_64:llvm-19.1.3
           before-script-linux: |
             apk update
@@ -343,7 +343,7 @@ jobs:
           rustup-components: rustfmt
           target: ${{ matrix.target }}
           manylinux: musllinux_1_2
-          args: --release --no-default-features --features bindgen-static --out dist --interpreter '3.7 3.8 3.9 3.10 3.11 3.12 3.13 pypy3.9 pypy3.10'
+          args: --release --no-default-features --features bindgen-static,lto --out dist --interpreter '3.7 3.8 3.9 3.10 3.11 3.12 3.13 pypy3.9 pypy3.10'
           container: congyuwang/musllinux_1_2_aarch64:llvm-19.1.3
           before-script-linux: |
             apk update

diff --git a/Cargo.toml b/Cargo.toml
@@ -22,6 +22,7 @@ rocksdb = { path = "rust-rocksdb", default-features = false, features = [
     "zstd",
     "zlib",
     "bzip2",
+    "lto",
 ] }
 librocksdb-sys = { path = "rust-rocksdb/librocksdb-sys", default-features = false }
 serde = { version = "1", features = ["derive"] }
-Original file line number
+Diff line change
@@ Expand Up @@
         "zstd",
         "zlib",
         "bzip2",
+        "lto",
     ] }
     librocksdb-sys = { path = "rust-rocksdb/librocksdb-sys", default-features = false }
     serde = { version = "1", features = ["derive"] }
@@ Expand Down @@