From 8742dcab3d65077ce09e4397d3b58419db0c4854 Mon Sep 17 00:00:00 2001 From: Ayaz Salikhov Date: Fri, 14 Nov 2025 11:48:14 +0000 Subject: [PATCH] ci: Use env vars instead of input (#2781) --- .github/actions/cmake/action.yml | 3 ++- .github/actions/conan/action.yml | 11 +++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/actions/cmake/action.yml b/.github/actions/cmake/action.yml index b7d5db65..3dbda842 100644 --- a/.github/actions/cmake/action.yml +++ b/.github/actions/cmake/action.yml @@ -44,6 +44,7 @@ runs: - name: Run cmake shell: bash env: + BUILD_DIR: "${{ inputs.build_dir }}" BUILD_TYPE: "${{ inputs.build_type }}" SANITIZER_OPTION: |- ${{ endsWith(inputs.conan_profile, '.asan') && '-Dsan=address' || @@ -58,7 +59,7 @@ runs: PACKAGE: "${{ inputs.package == 'true' && 'ON' || 'OFF' }}" run: | cmake \ - -B ${{inputs.build_dir}} \ + -B "${BUILD_DIR}" \ -S . \ -G Ninja \ -DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake \ diff --git a/.github/actions/conan/action.yml b/.github/actions/conan/action.yml index bd931f79..5c6a0ddd 100644 --- a/.github/actions/conan/action.yml +++ b/.github/actions/conan/action.yml @@ -28,11 +28,14 @@ runs: - name: Run conan shell: bash env: + BUILD_DIR: "${{ inputs.build_dir }}" CONAN_BUILD_OPTION: "${{ inputs.force_conan_source_build == 'true' && '*' || 'missing' }}" + BUILD_TYPE: "${{ inputs.build_type }}" + CONAN_PROFILE: "${{ inputs.conan_profile }}" run: | conan \ install . \ - -of build \ - -b "$CONAN_BUILD_OPTION" \ - -s "build_type=${{ inputs.build_type }}" \ - --profile:all "${{ inputs.conan_profile }}" + -of "${BUILD_DIR}" \ + -b "${CONAN_BUILD_OPTION}" \ + -s "build_type=${BUILD_TYPE}" \ + --profile:all "${CONAN_PROFILE}"