Skip to content

Commit a60b5a0

Browse files
authored
fix
1 parent 169108d commit a60b5a0

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

action.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -280,16 +280,12 @@ runs:
280280
if [ "${{ inputs.bundle-pdb }}" = "true" ] && [ ${{ steps.platform.outputs.id }} = "win" ]; then
281281
CMAKE_EXTRA_ARGS="$CMAKE_EXTRA_ARGS -DGEODE_BUNDLE_PDB=ON"
282282
fi
283-
cmake -B build -DCMAKE_BUILD_TYPE=${{ inputs.build-config }} -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DGEODE_CODEGEN_CMAKE_ARGS="-DCMAKE_C_COMPILER=clang;-DCMAKE_CXX_COMPILER=clang++;-G Ninja" -G Ninja $CMAKE_EXTRA_ARGS -DGEODE_DONT_INSTALL_MODS=ON -DGEODE_TARGET_PLATFORM=${{ steps.platform.outputs.target }} ${{ inputs.configure-args }}
284-
285-
CMAKE_EXTRA_BUILD_ARGS=""
286-
CCACHE_VARIANT="${{ inputs.ccache-variant }}"
287-
if [ -n "$CCACHE_VARIANT" ]; then
288-
CCACHE_PATH="$(which "$CCACHE_VARIANT")"
289-
CMAKE_EXTRA_BUILD_ARGS="$CMAKE_EXTRA_BUILD_ARGS -DCMAKE_C_COMPILER_LAUNCHER=${CCACHE_PATH} -DCMAKE_CXX_COMPILER_LAUNCHER=${CCACHE_PATH}"
283+
if [ -n "${{ inputs.ccache-variant }}" ]; then
284+
CCACHE_PATH="$(which "${{ inputs.ccache-variant }}")"
285+
CMAKE_EXTRA_ARGS="$CMAKE_EXTRA_ARGS -DCMAKE_C_COMPILER_LAUNCHER=${CCACHE_PATH} -DCMAKE_CXX_COMPILER_LAUNCHER=${CCACHE_PATH}"
290286
fi
291-
292-
cmake --build build --config ${{ inputs.build-config }} ${{ inputs.build-args }} $CMAKE_EXTRA_BUILD_ARGS
287+
cmake -B build -DCMAKE_BUILD_TYPE=${{ inputs.build-config }} -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DGEODE_CODEGEN_CMAKE_ARGS="-DCMAKE_C_COMPILER=clang;-DCMAKE_CXX_COMPILER=clang++;-G Ninja" -G Ninja $CMAKE_EXTRA_ARGS -DGEODE_DONT_INSTALL_MODS=ON -DGEODE_TARGET_PLATFORM=${{ steps.platform.outputs.target }} ${{ inputs.configure-args }}
288+
cmake --build build --config ${{ inputs.build-config }} ${{ inputs.build-args }}
293289
294290
mkdir "${{ github.workspace }}/output"
295291

0 commit comments

Comments
 (0)