z

datafuselabs · May 30, 2024 · 795aae4 · 795aae4
1 parent 45297bc
commit 795aae4
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 11 deletions.
diff --git a/.github/actions/build_linux/action.yml b/.github/actions/build_linux/action.yml
@@ -30,7 +30,7 @@ runs:
       uses: ./.github/actions/setup_build_tool
       with:
         target: ${{ inputs.target }}
-        bypass_env_vars: RUSTFLAGS,RUST_LOG,PYO3_PYTHON,LD_LIBRARY_PATH,PYO3_CROSS_PYTHON_VERSION
+        bypass_env_vars: RUSTFLAGS,RUST_LOG
 
     - name: Cross setup
       if: startsWith(inputs.target, 'aarch64-')
@@ -61,9 +61,6 @@ runs:
         echo "RUSTFLAGS=${flags} -C link-arg=-Wl,--compress-debug-sections=zlib" >> $GITHUB_ENV
         target=${{ inputs.target }}
         echo "BUILD_ARCH=${target/-unknown-linux-*}" >> $GITHUB_ENV
-        echo "LD_LIBRARY_PATH=/usr/local/lib" >> $GITHUB_ENV
-        echo "PYO3_PYTHON=python3.12" >> $GITHUB_ENV
-        echo "PYO3_CROSS_PYTHON_VERSION=/3.12" >> $GITHUB_ENV
 
     # build all binaries for debug
     - name: Build Debug

diff --git a/.github/actions/build_linux_sanitizer/action.yml b/.github/actions/build_linux_sanitizer/action.yml
@@ -19,7 +19,7 @@ runs:
       uses: ./.github/actions/setup_build_tool
       with:
         target: ${{ inputs.target }}
-        bypass_env_vars: RUSTFLAGS,RUST_LOG,PYO3_PYTHON,LD_LIBRARY_PATH
+        bypass_env_vars: RUSTFLAGS,RUST_LOG
 
     - name: Cross setup
       if: startsWith(inputs.target, 'aarch64-')

diff --git a/.github/actions/check/action.yml b/.github/actions/check/action.yml
@@ -10,7 +10,7 @@ runs:
     - name: Setup Build Tool
       uses: ./.github/actions/setup_build_tool
       with:
-        bypass_env_vars: RUSTFLAGS,RUST_LOG,GITHUB_TOKEN,PYO3_PYTHON,LD_LIBRARY_PATH
+        bypass_env_vars: RUSTFLAGS,RUST_LOG,GITHUB_TOKEN
 
     - name: Check Apache License Header
       uses: korandoru/hawkeye@v2

diff --git a/.github/actions/setup_build_tool/action.yml b/.github/actions/setup_build_tool/action.yml
@@ -8,7 +8,7 @@ inputs:
   bypass_env_vars:
     description: "Environment variables bypass to docker container"
     required: false
-    default: RUSTFLAGS,RUST_LOG,PYO3_PYTHON,LD_LIBRARY_PATH
+    default: RUSTFLAGS,RUST_LOG
 runs:
   using: "composite"
   steps:
@@ -28,9 +28,6 @@ runs:
         cat <<EOF >$BIN_LOCAL/build-tool
         #!/bin/bash
         script_name=\$(basename "\$0")
-        export PYO3_PYTHON=python3.12
-        export LD_LIBRARY_PATH=/usr/local/lib
-        export PYO3_CROSS_PYTHON_VERSION=3.12
         export INTERACTIVE=false
         export TARGET=${{ inputs.target }}
         export CARGO_INCREMENTAL=0

diff --git a/.github/actions/test_unit/action.yml b/.github/actions/test_unit/action.yml
@@ -7,7 +7,7 @@ runs:
     - name: Setup Build Tool
       uses: ./.github/actions/setup_build_tool
       with:
-        bypass_env_vars: RUSTFLAGS,RUSTDOCFLAGS,RUST_TEST_THREADS,RUST_LOG,RUST_BACKTRACE,PYO3_PYTHON,LD_LIBRARY_PATH
+        bypass_env_vars: RUSTFLAGS,RUSTDOCFLAGS,RUST_TEST_THREADS,RUST_LOG,RUST_BACKTRACE
 
     - shell: bash
       run: |