Skip to content

Commit a71005a

Browse files
re enabled windows cmake action
1 parent 87bcef3 commit a71005a

File tree

1 file changed

+23
-23
lines changed

1 file changed

+23
-23
lines changed

.github/workflows/cmake.yml

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: ${{ matrix.os }}
1919
strategy:
2020
matrix: # Disabling since latest-windows on GitHub CI is having issues?
21-
os: [ubuntu-latest, macOS-latest] #, windows-latest]
21+
os: [ubuntu-latest, macOS-latest, windows-latest]
2222

2323
steps:
2424
- uses: actions/checkout@v2
@@ -27,14 +27,14 @@ jobs:
2727
if: ${{ contains( runner.os, 'Linux' ) }}
2828
run: |
2929
sudo apt-get update && sudo apt-get install libhdf5-dev libnetcdf-dev libnetcdff-dev liblapack3 liblapack-dev libopenblas-dev liblapacke-dev
30-
#- name: Fetch OpenBLAS (Windows)
31-
# if: ${{ contains( runner.os, 'Windows' ) }}
32-
# run: |
33-
# curl https://github.com/OpenMathLib/OpenBLAS/releases/download/v0.3.26/OpenBLAS-0.3.26-x64.zip -L -o tmp.zip
34-
# 7z x ./tmp.zip -oOpenBLAS
35-
# cp ./OpenBLAS/lib/libopenblas.lib $GITHUB_WORKSPACE
36-
# cp ./OpenBLAS/bin/libopenblas.dll $GITHUB_WORKSPACE
37-
# echo "$GITHUB_WORKSPACE" >> $GITHUB_PATH
30+
- name: Fetch OpenBLAS (Windows)
31+
if: ${{ contains( runner.os, 'Windows' ) }}
32+
run: |
33+
curl https://github.com/OpenMathLib/OpenBLAS/releases/download/v0.3.26/OpenBLAS-0.3.26-x64.zip -L -o tmp.zip
34+
7z x ./tmp.zip -oOpenBLAS
35+
cp ./OpenBLAS/lib/libopenblas.lib $GITHUB_WORKSPACE
36+
cp ./OpenBLAS/bin/libopenblas.dll $GITHUB_WORKSPACE
37+
echo "$GITHUB_WORKSPACE" >> $GITHUB_PATH
3838
- name: Create Build Environment
3939
# Some projects don't allow in-source building, so create a separate build directory
4040
# We'll use this as our working directory for all subsequent commands
@@ -56,12 +56,12 @@ jobs:
5656
run: |
5757
cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSAF_PERFORMANCE_LIB=SAF_USE_APPLE_ACCELERATE -DSAF_ENABLE_TRACKER_MODULE=1 -DSAF_ENABLE_SOFA_READER_MODULE=1 -DSAF_ENABLE_HADES_MODULE=1
5858
59-
#- name: Configure CMake (Windows)
60-
# shell: bash
61-
# working-directory: ${{runner.workspace}}/build
62-
# if: ${{ contains( runner.os, 'Windows' ) }}
63-
# run: |
64-
# cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSAF_PERFORMANCE_LIB=SAF_USE_OPEN_BLAS_AND_LAPACKE -DOPENBLAS_LIBRARY=$GITHUB_WORKSPACE/OpenBLAS/lib/libopenblas.lib -DLAPACKE_LIBRARY=$GITHUB_WORKSPACE/OpenBLAS/lib/libopenblas.lib -DOPENBLAS_HEADER_PATH=$GITHUB_WORKSPACE/OpenBLAS/include/ -DSAF_ENABLE_TRACKER_MODULE=1 -DSAF_ENABLE_SOFA_READER_MODULE=1 -DSAF_ENABLE_HADES_MODULE=1
59+
- name: Configure CMake (Windows)
60+
shell: bash
61+
working-directory: ${{runner.workspace}}/build
62+
if: ${{ contains( runner.os, 'Windows' ) }}
63+
run: |
64+
cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSAF_PERFORMANCE_LIB=SAF_USE_OPEN_BLAS_AND_LAPACKE -DOPENBLAS_LIBRARY=$GITHUB_WORKSPACE/OpenBLAS/lib/libopenblas.lib -DLAPACKE_LIBRARY=$GITHUB_WORKSPACE/OpenBLAS/lib/libopenblas.lib -DOPENBLAS_HEADER_PATH=$GITHUB_WORKSPACE/OpenBLAS/include/ -DSAF_ENABLE_TRACKER_MODULE=1 -DSAF_ENABLE_SOFA_READER_MODULE=1 -DSAF_ENABLE_HADES_MODULE=1
6565
6666
- name: Build
6767
working-directory: ${{runner.workspace}}/build
@@ -76,11 +76,11 @@ jobs:
7676
# Execute tests
7777
run: ./test/saf_test
7878

79-
#- name: Test (Windows)
80-
# if: ${{ contains( runner.os, 'Windows' ) }}
81-
# working-directory: ${{runner.workspace}}/build
82-
# shell: bash
83-
# run: |
84-
# cp $GITHUB_WORKSPACE/libopenblas.dll ./test/$BUILD_TYPE/
85-
# ls -lh ./test/$BUILD_TYPE/
86-
# ./test/$BUILD_TYPE/saf_test.exe
79+
- name: Test (Windows)
80+
if: ${{ contains( runner.os, 'Windows' ) }}
81+
working-directory: ${{runner.workspace}}/build
82+
shell: bash
83+
run: |
84+
cp $GITHUB_WORKSPACE/libopenblas.dll ./test/$BUILD_TYPE/
85+
ls -lh ./test/$BUILD_TYPE/
86+
./test/$BUILD_TYPE/saf_test.exe

0 commit comments

Comments
 (0)