Skip to content

Commit e1630e3

Browse files
committed
Revert "Try without running tests"
This reverts commit 4c90c9f.
1 parent c4d00a8 commit e1630e3

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

.github/workflows/windows-arm.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ env:
1313
# Without this, invoking bash will cd to the home directory
1414
CHERE_INVOKING: "yes"
1515
BASH_PATH: "C:\\Program Files\\Git\\bin\\bash.exe"
16-
FORTRAN_BIN: flang
1716
PLAT: arm64
1817
INTERFACE64: 0
1918

@@ -63,8 +62,6 @@ jobs:
6362
7z a ../builds/scipy_openblas32.zip -tzip scipy_openblas32
6463
6564
- name: Test
66-
# Disable test while we work out bash / testing.
67-
if: false
6865
run: |
6966
& $env:BASH_PATH -lc tools/build_gfortran.sh
7067
echo "Static test"

tools/build_gfortran.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ nm $static_libname | grep dpotrf
1919
cp $dll_name .
2020

2121
if [ "$INTERFACE64" == "1" ]; then
22-
$FORTRAN_BIN -I $OBP/include -fdefault-integer-8 -o test.exe ${repo_path}/test64_.f90 $static_libname
23-
$FORTRAN_BIN -I $OBP/include -fdefault-integer-8 -o test_dyn.exe ${repo_path}/test64_.f90 $dynamic_libname
22+
gfortran -I $OBP/include -fdefault-integer-8 -o test.exe ${repo_path}/test64_.f90 $static_libname
23+
gfortran -I $OBP/include -fdefault-integer-8 -o test_dyn.exe ${repo_path}/test64_.f90 $dynamic_libname
2424
else
25-
$FORTRAN_BIN -I $OBP/include -o test.exe ${repo_path}/test.f90 $static_libname
26-
$FORTRAN_BIN -I $OBP/include -o test_dyn.exe ${repo_path}/test.f90 $dynamic_libname
25+
gfortran -I $OBP/include -o test.exe ${repo_path}/test.f90 $static_libname
26+
gfortran -I $OBP/include -o test_dyn.exe ${repo_path}/test.f90 $dynamic_libname
2727
fi

0 commit comments

Comments
 (0)