Skip to content

Commit 2c5e1cd

Browse files
committed
Drop +crt-static with non-static case
1 parent 27951a3 commit 2c5e1cd

File tree

1 file changed

+28
-20
lines changed

1 file changed

+28
-20
lines changed

.github/workflows/openblas-src.yml

Lines changed: 28 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,10 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
feature:
16-
- system
17-
- "system,static"
18-
rustflags:
19-
- "-C target-feature=+crt-static"
20-
- ""
15+
triple:
16+
- x64-windows
17+
- x64-windows-static
18+
- x64-windows-static-md
2119
steps:
2220
- uses: actions/checkout@v1
2321
- uses: actions/cache@v2
@@ -29,27 +27,37 @@ jobs:
2927
git clone https://github.com/Microsoft/vcpkg.git --depth 1
3028
cd vcpkg
3129
./bootstrap-vcpkg.bat
32-
- name: Install static-md OpenBLAS by vcpkg
33-
run: |
34-
./vcpkg/vcpkg.exe install openblas:x64-windows-static-md
35-
if: ${{ matrix.feature == 'system,static' && matrix.rustflags == '' }}
36-
- name: Install static OpenBLAS by vcpkg
37-
run: |
38-
./vcpkg/vcpkg.exe install openblas:x64-windows-static
39-
if: ${{ matrix.feature == 'system,static' && matrix.rustflags != '' }}
4030
- name: Install OpenBLAS by vcpkg
4131
run: |
42-
./vcpkg/vcpkg.exe install openblas:x64-windows
43-
if: ${{ matrix.feature == 'system' }}
32+
./vcpkg/vcpkg.exe install openblas:${{ matrix.triple }}
33+
4434
- uses: actions-rs/cargo@v1
35+
name: Test features=system
4536
with:
4637
command: test
47-
args: >
48-
--features=${{ matrix.feature }}
49-
--manifest-path=openblas-src/Cargo.toml
38+
args: --features=system --manifest-path=openblas-src/Cargo.toml
39+
env:
40+
VCPKG_ROOT: ${{ github.workspace }}/vcpkg
41+
if: ${{ matrix.triple == 'x64-windows' }}
42+
43+
- uses: actions-rs/cargo@v1
44+
name: Test features=system,static
45+
with:
46+
command: test
47+
args: --features=system,static --manifest-path=openblas-src/Cargo.toml
48+
env:
49+
VCPKG_ROOT: ${{ github.workspace }}/vcpkg
50+
if: ${{ matrix.triple == 'x64-windows-static-md' }}
51+
52+
- uses: actions-rs/cargo@v1
53+
name: Test features=system,static with crt-static
54+
with:
55+
command: test
56+
args: --features=system,static --manifest-path=openblas-src/Cargo.toml
5057
env:
5158
VCPKG_ROOT: ${{ github.workspace }}/vcpkg
52-
RUSTFLAGS: ${{ matrix.rustflags }}
59+
RUSTFLAGS: "-C target-feature=+crt-static"
60+
if: ${{ matrix.triple == 'x64-windows-static' }}
5361

5462
macos:
5563
runs-on: macos-10.15

0 commit comments

Comments
 (0)