Skip to content

Commit 112d026

Browse files
authored
bash no luck, back to generic ugly
1 parent ebd6219 commit 112d026

File tree

1 file changed

+5
-31
lines changed

1 file changed

+5
-31
lines changed

.github/workflows/cmake-errors.yml

Lines changed: 5 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -104,18 +104,12 @@ jobs:
104104
git clone https://github.com/mulle-core/mulle-core.git "${{steps.set-install-dir.outputs.MULLE_CORE_SRC_DIR}}"
105105
106106
- name: Configure, build and install mulle-core with CMake
107-
shell: bash
108107
working-directory: "${{steps.set-install-dir.outputs.MULLE_CORE_SRC_DIR}}"
109108
env:
110109
CC: ${{ matrix.compiler }}
111110
CFLAGS: ${{ matrix.cflags }}
112111
run: |
113-
cmake ${{ matrix.cmake-args }} \
114-
-B build \
115-
-DMULLE_SDK_PATH="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}" \
116-
-DCMAKE_INSTALL_PREFIX="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}" \
117-
-DCMAKE_PREFIX_PATH="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}" \
118-
-DCMAKE_BUILD_TYPE="${{ matrix.build-config || 'Release' }}"
112+
cmake ${{ matrix.cmake-args }} -B build -DMULLE_SDK_PATH="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}" -DCMAKE_INSTALL_PREFIX="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}" -DCMAKE_PREFIX_PATH="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}" -DCMAKE_BUILD_TYPE="${{ matrix.build-config || 'Release' }}"
119113
cmake --build build --config "${{ matrix.build-config || 'Release' }}"
120114
cmake --install build --config "${{ matrix.build-config || 'Release' }}"
121115
@@ -124,18 +118,12 @@ jobs:
124118
git clone https://github.com/mulle-core/mulle-atinit.git "${{steps.set-install-dir.outputs.MULLE_ATINIT_SRC_DIR}}"
125119
126120
- name: Configure, build and install mulle-atinit with CMake
127-
shell: bash
128121
working-directory: "${{steps.set-install-dir.outputs.MULLE_ATINIT_SRC_DIR}}"
129122
env:
130123
CC: ${{ matrix.compiler }}
131124
CFLAGS: ${{ matrix.cflags }}
132125
run: |
133-
cmake ${{ matrix.cmake-args }} \
134-
-B build \
135-
-DMULLE_SDK_PATH="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}" \
136-
-DCMAKE_INSTALL_PREFIX="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}" \
137-
-DCMAKE_PREFIX_PATH="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}" \
138-
-DCMAKE_BUILD_TYPE="${{ matrix.build-config || 'Release' }}"
126+
cmake ${{ matrix.cmake-args }} -B build -DMULLE_SDK_PATH="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}" -DCMAKE_INSTALL_PREFIX="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}" -DCMAKE_PREFIX_PATH="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}" -DCMAKE_BUILD_TYPE="${{ matrix.build-config || 'Release' }}"
139127
cmake --build build --config "${{ matrix.build-config || 'Release' }}"
140128
cmake --install build --config "${{ matrix.build-config || 'Release' }}"
141129
@@ -144,18 +132,12 @@ jobs:
144132
git clone https://github.com/mulle-core/mulle-atexit.git "${{steps.set-install-dir.outputs.MULLE_ATEXIT_SRC_DIR}}"
145133
146134
- name: Configure, build and install mulle-atexit with CMake
147-
shell: bash
148135
working-directory: "${{steps.set-install-dir.outputs.MULLE_ATEXIT_SRC_DIR}}"
149136
env:
150137
CC: ${{ matrix.compiler }}
151138
CFLAGS: ${{ matrix.cflags }}
152139
run: |
153-
cmake ${{ matrix.cmake-args }} \
154-
-B build \
155-
-DMULLE_SDK_PATH="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}" \
156-
-DCMAKE_INSTALL_PREFIX="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}" \
157-
-DCMAKE_PREFIX_PATH="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}" \
158-
-DCMAKE_BUILD_TYPE="${{ matrix.build-config || 'Release' }}"
140+
cmake ${{ matrix.cmake-args }} -B build -DMULLE_SDK_PATH="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}" -DCMAKE_INSTALL_PREFIX="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}" -DCMAKE_PREFIX_PATH="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}" -DCMAKE_BUILD_TYPE="${{ matrix.build-config || 'Release' }}"
159141
cmake --build build --config "${{ matrix.build-config || 'Release' }}"
160142
cmake --install build --config "${{ matrix.build-config || 'Release' }}"
161143
@@ -165,22 +147,14 @@ jobs:
165147
choco install --no-progress ninja ${{ matrix.packages }}
166148
167149
- name: Generate project files
168-
shell: bash
169150
env:
170151
CC: ${{ matrix.compiler }}
171152
CFLAGS: ${{ matrix.cflags }}
172153
run: |
173-
cmake ${{ matrix.cmake-args }} \
174-
-S "${{ matrix.src-dir || '.' }}" \
175-
-B "${{ matrix.build-dir || 'build' }}" \
176-
-DMULLE_SDK_PATH="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}" \
177-
-DCMAKE_INSTALL_PREFIX="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}" \
178-
-DCMAKE_PREFIX_PATH="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}" \
179-
-DCMAKE_BUILD_TYPE="${{ matrix.build-config || 'Release' }}"
154+
cmake ${{ matrix.cmake-args }} -B build -DMULLE_SDK_PATH="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}" -DCMAKE_INSTALL_PREFIX="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}" -DCMAKE_PREFIX_PATH="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}" -DCMAKE_BUILD_TYPE="${{ matrix.build-config || 'Release' }}"
180155
181156
- name: Compile source code
182157
shell: bash
183158
run: |
184-
cmake --build "${{ matrix.build-dir || 'build' }}" \
185-
--config "${{ matrix.build-config || 'Release' }}"
159+
cmake --build "${{ matrix.build-dir || 'build' }}" --config "${{ matrix.build-config || 'Release' }}"
186160

0 commit comments

Comments
 (0)