iamthad commited on
Commit
66cb760
·
unverified ·
1 Parent(s): 37d6862

ci : fix variable names in GitHub actions config (#1440)

Browse files

* Remove _SUPPORT from variables

* Change blasdir to OPENBLAS_PATH

* Update OpenBLAS URLs

Files changed (1) hide show
  1. .github/workflows/build.yml +10 -10
.github/workflows/build.yml CHANGED
@@ -88,7 +88,7 @@ jobs:
88
  -w /workspace ${{ env.ubuntu_image }} /bin/sh -c '
89
  apt update
90
  apt install -y build-essential cmake libsdl2-dev
91
- cmake . -DWHISPER_SUPPORT_SDL2=ON -DCMAKE_BUILD_TYPE=${{ matrix.build }}
92
  make
93
  ctest -L gh --output-on-failure'
94
 
@@ -115,7 +115,7 @@ jobs:
115
  -w /workspace ${{ env.ubuntu_image }} /bin/sh -c '
116
  apt update
117
  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
119
  make
120
  ctest -L gh --output-on-failure'
121
 
@@ -182,7 +182,7 @@ jobs:
182
  run: >
183
  cmake -S . -B ./build -A ${{ matrix.arch }}
184
  -DCMAKE_BUILD_TYPE=${{ matrix.build }}
185
- -DWHISPER_SUPPORT_SDL2=${{ matrix.sdl2 }}
186
 
187
  - name: Build
188
  run: |
@@ -217,10 +217,10 @@ jobs:
217
  sdl2: [ON]
218
  include:
219
  - arch: Win32
220
- obzip: https://github.com/xianyi/OpenBLAS/releases/download/v0.3.21/OpenBLAS-0.3.21-x86.zip
221
  s2arc: x86
222
  - arch: x64
223
- obzip: https://github.com/xianyi/OpenBLAS/releases/download/v0.3.21/OpenBLAS-0.3.21-x64.zip
224
  s2arc: x64
225
  - sdl2: ON
226
  s2ver: 2.26.0
@@ -239,7 +239,7 @@ jobs:
239
  7z x blas.zip -oblas -y
240
  copy blas/include/cblas.h .
241
  copy blas/include/openblas_config.h .
242
- echo "blasdir=$env:GITHUB_WORKSPACE/blas" >> $env:GITHUB_ENV
243
 
244
  - name: Fetch SDL2 and set SDL2_DIR
245
  if: matrix.sdl2 == 'ON'
@@ -252,9 +252,9 @@ jobs:
252
  run: >
253
  cmake -S . -B ./build -A ${{ matrix.arch }}
254
  -DCMAKE_BUILD_TYPE=${{ matrix.build }}
255
- -DWHISPER_SUPPORT_OPENBLAS=${{ matrix.blas }}
256
- -DCMAKE_LIBRARY_PATH="$env:blasdir/lib"
257
- -DWHISPER_SUPPORT_SDL2=${{ matrix.sdl2 }}
258
 
259
  - name: Build
260
  run: |
@@ -263,7 +263,7 @@ jobs:
263
 
264
  - name: Copy libopenblas.dll
265
  if: matrix.blas == 'ON'
266
- run: copy "$env:blasdir/bin/libopenblas.dll" build/bin/${{ matrix.build }}
267
 
268
  - name: Copy SDL2.dll
269
  if: matrix.sdl2 == 'ON'
 
88
  -w /workspace ${{ env.ubuntu_image }} /bin/sh -c '
89
  apt update
90
  apt install -y build-essential cmake libsdl2-dev
91
+ cmake . -DWHISPER_SDL2=ON -DCMAKE_BUILD_TYPE=${{ matrix.build }}
92
  make
93
  ctest -L gh --output-on-failure'
94
 
 
115
  -w /workspace ${{ env.ubuntu_image }} /bin/sh -c '
116
  apt update
117
  apt install -y build-essential cmake libsdl2-dev
118
+ cmake . -DWHISPER_SDL2=ON -DCMAKE_BUILD_TYPE=${{ matrix.build }} -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang
119
  make
120
  ctest -L gh --output-on-failure'
121
 
 
182
  run: >
183
  cmake -S . -B ./build -A ${{ matrix.arch }}
184
  -DCMAKE_BUILD_TYPE=${{ matrix.build }}
185
+ -DWHISPER_SDL2=${{ matrix.sdl2 }}
186
 
187
  - name: Build
188
  run: |
 
217
  sdl2: [ON]
218
  include:
219
  - arch: Win32
220
+ obzip: https://github.com/OpenMathLib/OpenBLAS/releases/download/v0.3.24/OpenBLAS-0.3.24-x86.zip
221
  s2arc: x86
222
  - arch: x64
223
+ obzip: https://github.com/OpenMathLib/OpenBLAS/releases/download/v0.3.24/OpenBLAS-0.3.24-x64.zip
224
  s2arc: x64
225
  - sdl2: ON
226
  s2ver: 2.26.0
 
239
  7z x blas.zip -oblas -y
240
  copy blas/include/cblas.h .
241
  copy blas/include/openblas_config.h .
242
+ echo "OPENBLAS_PATH=$env:GITHUB_WORKSPACE/blas" >> $env:GITHUB_ENV
243
 
244
  - name: Fetch SDL2 and set SDL2_DIR
245
  if: matrix.sdl2 == 'ON'
 
252
  run: >
253
  cmake -S . -B ./build -A ${{ matrix.arch }}
254
  -DCMAKE_BUILD_TYPE=${{ matrix.build }}
255
+ -DWHISPER_OPENBLAS=${{ matrix.blas }}
256
+ -DCMAKE_LIBRARY_PATH="$env:OPENBLAS_PATH/lib"
257
+ -DWHISPER_SDL2=${{ matrix.sdl2 }}
258
 
259
  - name: Build
260
  run: |
 
263
 
264
  - name: Copy libopenblas.dll
265
  if: matrix.blas == 'ON'
266
+ run: copy "$env:OPENBLAS_PATH/bin/libopenblas.dll" build/bin/${{ matrix.build }}
267
 
268
  - name: Copy SDL2.dll
269
  if: matrix.sdl2 == 'ON'