Skip to content

Commit 6e55c09

Browse files
committed
added a switch to disable coolprop
1 parent f3f8139 commit 6e55c09

1 file changed

Lines changed: 29 additions & 12 deletions

File tree

.github/workflows/ci.yml

Lines changed: 29 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ jobs:
5454
get-coolprop:
5555
runs-on: ubuntu-latest
5656
outputs:
57-
coolprop-hash: ${{ steps.keycoolprop.outputs.coolprop-hash }}
57+
coolprop-hash: ${{ steps.coolprop_hash.outputs.coolprop-hash }}
58+
coolprop-check: ${{ steps.coolprop_check.outputs.coolprop-check }}
5859
env:
5960
COOLPROP_VERSION: v7.1.0
6061
steps:
@@ -71,6 +72,7 @@ jobs:
7172
lookup-only: true
7273
- name: Download CoolProp sources
7374
if: steps.coolprop_cache.outputs.cache-hit != 'true'
75+
shell: bash
7476
run: |
7577
mkdir externals
7678
cd externals
@@ -84,6 +86,20 @@ jobs:
8486
with:
8587
key: coolprop-${{ steps.coolprop_hash.outputs.coolprop-hash }}
8688
path: externals/CoolProp.git
89+
- name: Set CoolProp availability
90+
id: coolprop_check
91+
shell: bash
92+
run: |
93+
if [ "${{ steps.coolprop_cache.outputs.cache-hit }}" = "true" ]; then
94+
echo "CoolProp is available"
95+
else
96+
echo "CoolProp was just downloaded"
97+
fi
98+
if [ -d "externals/CoolProp.git" ]; then
99+
echo "coolprop-check=1" >> $GITHUB_OUTPUT
100+
else
101+
echo "coolprop-check=0" >> $GITHUB_OUTPUT
102+
fi
87103
88104
build-macos:
89105
needs: get-coolprop
@@ -111,8 +127,8 @@ jobs:
111127
- name: Configure with CMake
112128
working-directory: ${{runner.workspace}}/build
113129
run: |
114-
cmake ${GITHUB_WORKSPACE}/Projects -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch }} -DFLUIDPROP=0 -DCOOLPROP=1 || true
115-
cmake ${GITHUB_WORKSPACE}/Projects -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch }} -DFLUIDPROP=0 -DCOOLPROP=1
130+
cmake ${GITHUB_WORKSPACE}/Projects -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch }} -DFLUIDPROP=0 -DCOOLPROP=${{ needs.get-coolprop.outputs.coolprop-check }} || true
131+
cmake ${GITHUB_WORKSPACE}/Projects -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch }} -DFLUIDPROP=0 -DCOOLPROP=${{ needs.get-coolprop.outputs.coolprop-check }}
116132
- name: Build with CMake
117133
working-directory: ${{runner.workspace}}/build
118134
run: cmake --build . --target ExternalMediaLib
@@ -151,8 +167,8 @@ jobs:
151167
- name: Configure with CMake
152168
working-directory: ${{runner.workspace}}/build
153169
run: |
154-
cmake ${GITHUB_WORKSPACE}/Projects -DCMAKE_BUILD_TYPE=Release -DFLUIDPROP=0 -DCOOLPROP=1 || true
155-
cmake ${GITHUB_WORKSPACE}/Projects -DCMAKE_BUILD_TYPE=Release -DFLUIDPROP=0 -DCOOLPROP=1
170+
cmake ${GITHUB_WORKSPACE}/Projects -DCMAKE_BUILD_TYPE=Release -DFLUIDPROP=0 -DCOOLPROP=${{ needs.get-coolprop.outputs.coolprop-check }} || true
171+
cmake ${GITHUB_WORKSPACE}/Projects -DCMAKE_BUILD_TYPE=Release -DFLUIDPROP=0 -DCOOLPROP=${{ needs.get-coolprop.outputs.coolprop-check }}
156172
- name: Build with CMake
157173
working-directory: ${{runner.workspace}}/build
158174
run: cmake --build . --target ExternalMediaLib
@@ -196,8 +212,8 @@ jobs:
196212
- name: Configure with CMake
197213
working-directory: ${{runner.workspace}}/build
198214
run: |
199-
cmake ${{ runner.workspace }}/ExternalMedia/Projects -A ${{ matrix.arch }} -G "${{ matrix.generator }}" -T "${{ matrix.toolset }}" -DFLUIDPROP=1 -DCOOLPROP=1
200-
cmake ${{ runner.workspace }}/ExternalMedia/Projects -A ${{ matrix.arch }} -G "${{ matrix.generator }}" -T "${{ matrix.toolset }}" -DFLUIDPROP=1 -DCOOLPROP=1
215+
cmake ${{ runner.workspace }}/ExternalMedia/Projects -A ${{ matrix.arch }} -G "${{ matrix.generator }}" -T "${{ matrix.toolset }}" -DFLUIDPROP=1 -DCOOLPROP=${{ needs.get-coolprop.outputs.coolprop-check }}
216+
cmake ${{ runner.workspace }}/ExternalMedia/Projects -A ${{ matrix.arch }} -G "${{ matrix.generator }}" -T "${{ matrix.toolset }}" -DFLUIDPROP=1 -DCOOLPROP=${{ needs.get-coolprop.outputs.coolprop-check }}
201217
- name: Build with CMake
202218
working-directory: ${{runner.workspace}}/build
203219
run: cmake --build . --target ExternalMediaLib --config Release
@@ -243,7 +259,8 @@ jobs:
243259
strategy:
244260
matrix:
245261
include:
246-
- bitness: [32, 64]
262+
- bitness: 32
263+
- bitness: 64
247264
steps:
248265
- name: Restore the OMDev cache
249266
uses: actions/cache/restore@v4
@@ -261,8 +278,8 @@ jobs:
261278
working-directory: ${{runner.workspace}}
262279
run: |
263280
$env:Path = "${env:ProgramFiles}\CMake\bin;C:\OMDev\tools\msys\usr\bin;C:\OMDev\tools\msys\mingw${{ matrix.bitness }}\bin;$env:Path"
264-
cmake -B build -S ${{ runner.workspace }}/ExternalMedia/Projects -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release -DFLUIDPROP=1 -DCOOLPROP=1
265-
cmake -B build -S ${{ runner.workspace }}/ExternalMedia/Projects -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release -DFLUIDPROP=1 -DCOOLPROP=1
281+
cmake -B build -S ${{ runner.workspace }}/ExternalMedia/Projects -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release -DFLUIDPROP=1 -DCOOLPROP=${{ needs.get-coolprop.outputs.coolprop-check }}
282+
cmake -B build -S ${{ runner.workspace }}/ExternalMedia/Projects -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release -DFLUIDPROP=1 -DCOOLPROP=${{ needs.get-coolprop.outputs.coolprop-check }}
266283
- name: Build with CMake for ${{ matrix.bitness }}bit
267284
working-directory: ${{runner.workspace}}
268285
run: |
@@ -292,8 +309,8 @@ jobs:
292309
- name: Configure with CMake
293310
working-directory: ${{runner.workspace}}/build
294311
run: |
295-
cmake ${{ runner.workspace }}/ExternalMedia/Projects -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release -DFLUIDPROP=1 -DCOOLPROP=1
296-
cmake ${{ runner.workspace }}/ExternalMedia/Projects -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release -DFLUIDPROP=1 -DCOOLPROP=1
312+
cmake ${{ runner.workspace }}/ExternalMedia/Projects -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release -DFLUIDPROP=1 -DCOOLPROP=${{ needs.get-coolprop.outputs.coolprop-check }}
313+
cmake ${{ runner.workspace }}/ExternalMedia/Projects -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release -DFLUIDPROP=1 -DCOOLPROP=${{ needs.get-coolprop.outputs.coolprop-check }}
297314
- name: Build with CMake
298315
working-directory: ${{runner.workspace}}/build
299316
run: cmake --build . --target ExternalMediaLib

0 commit comments

Comments
 (0)