Skip to content

Commit 435a6b7

Browse files
authored
ci : fix variable names in GitHub actions config (#1440)
* Remove _SUPPORT from variables * Change blasdir to OPENBLAS_PATH * Update OpenBLAS URLs
1 parent 75dc800 commit 435a6b7

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

.github/workflows/build.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
-w /workspace ${{ env.ubuntu_image }} /bin/sh -c '
8989
apt update
9090
apt install -y build-essential cmake libsdl2-dev
91-
cmake . -DWHISPER_SUPPORT_SDL2=ON -DCMAKE_BUILD_TYPE=${{ matrix.build }}
91+
cmake . -DWHISPER_SDL2=ON -DCMAKE_BUILD_TYPE=${{ matrix.build }}
9292
make
9393
ctest -L gh --output-on-failure'
9494
@@ -115,7 +115,7 @@ jobs:
115115
-w /workspace ${{ env.ubuntu_image }} /bin/sh -c '
116116
apt update
117117
apt install -y build-essential cmake libsdl2-dev
118-
cmake . -DWHISPER_SUPPORT_SDL2=ON -DCMAKE_BUILD_TYPE=${{ matrix.build }} -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang
118+
cmake . -DWHISPER_SDL2=ON -DCMAKE_BUILD_TYPE=${{ matrix.build }} -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang
119119
make
120120
ctest -L gh --output-on-failure'
121121
@@ -182,7 +182,7 @@ jobs:
182182
run: >
183183
cmake -S . -B ./build -A ${{ matrix.arch }}
184184
-DCMAKE_BUILD_TYPE=${{ matrix.build }}
185-
-DWHISPER_SUPPORT_SDL2=${{ matrix.sdl2 }}
185+
-DWHISPER_SDL2=${{ matrix.sdl2 }}
186186
187187
- name: Build
188188
run: |
@@ -217,10 +217,10 @@ jobs:
217217
sdl2: [ON]
218218
include:
219219
- arch: Win32
220-
obzip: https://github.com/xianyi/OpenBLAS/releases/download/v0.3.21/OpenBLAS-0.3.21-x86.zip
220+
obzip: https://github.com/OpenMathLib/OpenBLAS/releases/download/v0.3.24/OpenBLAS-0.3.24-x86.zip
221221
s2arc: x86
222222
- arch: x64
223-
obzip: https://github.com/xianyi/OpenBLAS/releases/download/v0.3.21/OpenBLAS-0.3.21-x64.zip
223+
obzip: https://github.com/OpenMathLib/OpenBLAS/releases/download/v0.3.24/OpenBLAS-0.3.24-x64.zip
224224
s2arc: x64
225225
- sdl2: ON
226226
s2ver: 2.26.0
@@ -239,7 +239,7 @@ jobs:
239239
7z x blas.zip -oblas -y
240240
copy blas/include/cblas.h .
241241
copy blas/include/openblas_config.h .
242-
echo "blasdir=$env:GITHUB_WORKSPACE/blas" >> $env:GITHUB_ENV
242+
echo "OPENBLAS_PATH=$env:GITHUB_WORKSPACE/blas" >> $env:GITHUB_ENV
243243
244244
- name: Fetch SDL2 and set SDL2_DIR
245245
if: matrix.sdl2 == 'ON'
@@ -252,9 +252,9 @@ jobs:
252252
run: >
253253
cmake -S . -B ./build -A ${{ matrix.arch }}
254254
-DCMAKE_BUILD_TYPE=${{ matrix.build }}
255-
-DWHISPER_SUPPORT_OPENBLAS=${{ matrix.blas }}
256-
-DCMAKE_LIBRARY_PATH="$env:blasdir/lib"
257-
-DWHISPER_SUPPORT_SDL2=${{ matrix.sdl2 }}
255+
-DWHISPER_OPENBLAS=${{ matrix.blas }}
256+
-DCMAKE_LIBRARY_PATH="$env:OPENBLAS_PATH/lib"
257+
-DWHISPER_SDL2=${{ matrix.sdl2 }}
258258
259259
- name: Build
260260
run: |
@@ -263,7 +263,7 @@ jobs:
263263
264264
- name: Copy libopenblas.dll
265265
if: matrix.blas == 'ON'
266-
run: copy "$env:blasdir/bin/libopenblas.dll" build/bin/${{ matrix.build }}
266+
run: copy "$env:OPENBLAS_PATH/bin/libopenblas.dll" build/bin/${{ matrix.build }}
267267

268268
- name: Copy SDL2.dll
269269
if: matrix.sdl2 == 'ON'

0 commit comments

Comments
 (0)