Skip to content

Commit

Permalink
z
Browse files Browse the repository at this point in the history
  • Loading branch information
everpcpc committed May 30, 2024
1 parent 45297bc commit 795aae4
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 11 deletions.
5 changes: 1 addition & 4 deletions .github/actions/build_linux/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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-')
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/build_linux_sanitizer/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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-')
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/check/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 1 addition & 4 deletions .github/actions/setup_build_tool/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/test_unit/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down

0 comments on commit 795aae4

Please sign in to comment.