Skip to content

Commit 42154c8

Browse files
authored
simplify and hope
1 parent 7a4531f commit 42154c8

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

.github/workflows/cmake-errors.yml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -147,23 +147,22 @@ jobs:
147147
cmake --build build --config Release
148148
cmake --install build --config Release
149149
150-
- name: Install packages (Windows)
151-
if: runner.os == 'Windows'
152-
run: |
153-
choco install --no-progress ninja ${{ matrix.packages }}
154-
155150
- name: Generate project files
156151
shell: bash
152+
env:
153+
CC: ${{ matrix.compiler }}
154+
CFLAGS: ${{ matrix.cflags }}
157155
run: |
158156
cmake ${{ matrix.cmake-args }} \
159157
-S "${{ matrix.src-dir || '.' }}" \
160-
-B "${{ matrix.build-dir || '.' }}" \
158+
-B "${{ matrix.build-dir || build }}" \
161159
-DMULLE_SDK_PATH="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}" \
162-
-DCMAKE_BUILD_TYPE="${{ matrix.build-config || 'Release' }}" \
160+
-DCMAKE_INSTALL_PREFIX="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}" \
163161
-DCMAKE_PREFIX_PATH="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}"
164-
env:
165-
CC: ${{ matrix.compiler }}
166-
CFLAGS: ${{ matrix.cflags }}
162+
-DCMAKE_BUILD_TYPE="${{ matrix.build-config || 'Release' }}" \
167163
168164
- name: Compile source code
169-
run: cmake --build "${{ matrix.build-dir || '.' }}" --config "${{ matrix.build-config || 'Release' }}"
165+
shell: bash
166+
run: |
167+
cmake --build "${{ matrix.build-dir || '.' }}" \
168+
--config "${{ matrix.build-config || 'Release' }}"

0 commit comments

Comments
 (0)