Skip to content

Commit 8742dca

Browse files
authored
ci: Use env vars instead of input (#2781)
1 parent 1ef7ec3 commit 8742dca

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

.github/actions/cmake/action.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ runs:
4444
- name: Run cmake
4545
shell: bash
4646
env:
47+
BUILD_DIR: "${{ inputs.build_dir }}"
4748
BUILD_TYPE: "${{ inputs.build_type }}"
4849
SANITIZER_OPTION: |-
4950
${{ endsWith(inputs.conan_profile, '.asan') && '-Dsan=address' ||
@@ -58,7 +59,7 @@ runs:
5859
PACKAGE: "${{ inputs.package == 'true' && 'ON' || 'OFF' }}"
5960
run: |
6061
cmake \
61-
-B ${{inputs.build_dir}} \
62+
-B "${BUILD_DIR}" \
6263
-S . \
6364
-G Ninja \
6465
-DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake \

.github/actions/conan/action.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,14 @@ runs:
2828
- name: Run conan
2929
shell: bash
3030
env:
31+
BUILD_DIR: "${{ inputs.build_dir }}"
3132
CONAN_BUILD_OPTION: "${{ inputs.force_conan_source_build == 'true' && '*' || 'missing' }}"
33+
BUILD_TYPE: "${{ inputs.build_type }}"
34+
CONAN_PROFILE: "${{ inputs.conan_profile }}"
3235
run: |
3336
conan \
3437
install . \
35-
-of build \
36-
-b "$CONAN_BUILD_OPTION" \
37-
-s "build_type=${{ inputs.build_type }}" \
38-
--profile:all "${{ inputs.conan_profile }}"
38+
-of "${BUILD_DIR}" \
39+
-b "${CONAN_BUILD_OPTION}" \
40+
-s "build_type=${BUILD_TYPE}" \
41+
--profile:all "${CONAN_PROFILE}"

0 commit comments

Comments
 (0)