From 795aae4118cebe784460b3ea3573a692ff2bd773 Mon Sep 17 00:00:00 2001 From: everpcpc Date: Thu, 30 May 2024 14:59:35 +0800 Subject: [PATCH] z --- .github/actions/build_linux/action.yml | 5 +---- .github/actions/build_linux_sanitizer/action.yml | 2 +- .github/actions/check/action.yml | 2 +- .github/actions/setup_build_tool/action.yml | 5 +---- .github/actions/test_unit/action.yml | 2 +- 5 files changed, 5 insertions(+), 11 deletions(-) diff --git a/.github/actions/build_linux/action.yml b/.github/actions/build_linux/action.yml index bc92bfb44d157..63228c9a10272 100644 --- 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 index 87eb8c2a314a4..615b59104b8b7 100644 --- 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 index dd64ec5787091..161e844958e70 100644 --- 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 index 290c35a213988..580be26142e6a 100644 --- 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 <$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 index 75860bd6a3740..adb8fc5719b44 100644 --- 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: |