Skip to content

Commit 64d80ba

Browse files
committed
Bump ureq from 2 to 3. Bump openblas from 0.3.28 to 0.3.30. Fix CI
1 parent 04e9b02 commit 64d80ba

File tree

6 files changed

+940
-19
lines changed

6 files changed

+940
-19
lines changed

.github/workflows/openblas-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ jobs:
3333
sudo apt update
3434
sudo apt install -y gfortran
3535
- name: Common minor tests
36-
run: cargo test --manifest-path=openblas-build/Cargo.toml
36+
run: cargo test -p openblas-build
3737
- name: Build test
38-
run: cargo test ${{ matrix.test_target }} --manifest-path=openblas-build/Cargo.toml -- --ignored
38+
run: cargo test ${{ matrix.test_target }} -p openblas-build -- --ignored

.github/workflows/openblas-src.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,19 @@ jobs:
4242
run: |
4343
./vcpkg/vcpkg.exe install openblas:${{ matrix.triple }}
4444
- name: Test features=system
45-
run: cargo test --features=system --manifest-path=openblas-src/Cargo.toml
45+
run: cargo test --features=system -p openblas-src
4646
env:
4747
VCPKG_ROOT: ${{ github.workspace }}/vcpkg
4848
if: ${{ matrix.triple == 'x64-windows' }}
4949

5050
- name: Test features=system,static
51-
run: cargo test --features=system,static --manifest-path=openblas-src/Cargo.toml
51+
run: cargo test --features=system,static -p openblas-src
5252
env:
5353
VCPKG_ROOT: ${{ github.workspace }}/vcpkg
5454
if: ${{ matrix.triple == 'x64-windows-static-md' }}
5555

5656
- name: Test features=system,static with crt-static
57-
run: cargo test --features=system,static --manifest-path=openblas-src/Cargo.toml
57+
run: cargo test --features=system,static -p openblas-src
5858
env:
5959
VCPKG_ROOT: ${{ github.workspace }}/vcpkg
6060
RUSTFLAGS: "-C target-feature=+crt-static"
@@ -78,7 +78,7 @@ jobs:
7878
brew install openblas
7979
if: ${{ contains(matrix.feature, 'system') }}
8080
- name: Test features=${{ matrix.feature }}
81-
run: cargo test --features=${{ matrix.feature }} --manifest-path=openblas-src/Cargo.toml
81+
run: cargo test --features=${{ matrix.feature }} -p openblas-src
8282

8383
x86_64-unknown-linux-gnu:
8484
runs-on: ubuntu-22.04
@@ -103,7 +103,7 @@ jobs:
103103
sudo apt install -y libopenblas-dev
104104
if: ${{ contains(matrix.feature, 'system') }}
105105
- name: Test features=${{ matrix.feature }}
106-
run: cargo test --features=${{ matrix.feature }} --manifest-path=openblas-src/Cargo.toml
106+
run: cargo test --features=${{ matrix.feature }} -p openblas-src
107107

108108
cross:
109109
name: ${{matrix.target}} (${{matrix.feature}})
@@ -139,7 +139,9 @@ jobs:
139139
run: |
140140
sudo apt update
141141
sudo apt install -y libopenblas-dev
142+
- name: ensure dependencies
143+
run: CARGO_RESOLVER_INCOMPATIBLE_RUST_VERSIONS="fallback" cargo update
142144
- name: Install toolchain
143145
uses: dtolnay/[email protected]
144-
- name: cargo test
145-
run: cargo check --manifest-path=openblas-src/Cargo.toml --features=system
146+
- name: Test MSRV
147+
run: cargo check -p openblas-src --locked --features=system

0 commit comments

Comments
 (0)