Skip to content

Commit 0af8af8

Browse files
authored
Merge pull request #101 from rust-math/ocipkg-anonymous-pull
ocipkg 0.2.6, anonymous pulling container
2 parents 5e1ae24 + 5e4d0bd commit 0af8af8

File tree

3 files changed

+31
-24
lines changed

3 files changed

+31
-24
lines changed

.github/workflows/intel-mkl-sys.yml

Lines changed: 29 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,52 +7,58 @@ on:
77
pull_request: {}
88

99
jobs:
10-
linux:
10+
linux-official:
1111
strategy:
1212
fail-fast: false
1313
matrix:
14-
image:
15-
- ghcr.io/rust-math/rust-mkl:1.62.1-2020.1
16-
- rust:1.62.1
1714
feature:
18-
- ""
15+
- "" # test of no-feature
1916
- mkl-static-lp64-iomp
2017
- mkl-static-lp64-seq
2118
- mkl-static-ilp64-iomp
2219
- mkl-static-ilp64-seq
23-
include:
24-
- image: ghcr.io/rust-math/rust-mkl:1.62.1-2020.1
25-
feature: mkl-dynamic-lp64-iomp
26-
- image: ghcr.io/rust-math/rust-mkl:1.62.1-2020.1
27-
feature: mkl-dynamic-lp64-seq
28-
- image: ghcr.io/rust-math/rust-mkl:1.62.1-2020.1
29-
feature: mkl-dynamic-ilp64-iomp
30-
- image: ghcr.io/rust-math/rust-mkl:1.62.1-2020.1
31-
feature: mkl-dynamic-ilp64-seq
20+
- mkl-dynamic-lp64-iomp
21+
- mkl-dynamic-lp64-seq
22+
- mkl-dynamic-ilp64-iomp
23+
- mkl-dynamic-ilp64-seq
3224
runs-on: ubuntu-22.04
3325
container:
34-
image: ${{ matrix.image }}
26+
image: ghcr.io/rust-math/rust-mkl:1.62.1-2020.1
3527
steps:
3628
- uses: actions/checkout@v1
29+
- uses: actions-rs/cargo@v1
30+
with:
31+
command: test
32+
args: >
33+
--manifest-path=intel-mkl-sys/Cargo.toml
34+
--features=${{ matrix.feature }}
3735
36+
linux-ocipkg:
37+
strategy:
38+
fail-fast: false
39+
matrix:
40+
feature:
41+
- mkl-static-lp64-iomp
42+
- mkl-static-lp64-seq
43+
- mkl-static-ilp64-iomp
44+
- mkl-static-ilp64-seq
45+
runs-on: ubuntu-22.04
46+
container:
47+
image: rust:1.62.1
48+
steps:
49+
- uses: actions/checkout@v1
3850
- uses: actions-rs/cargo@v1
39-
if: matrix.image == 'rust:1.62.1'
4051
with:
4152
command: install
42-
args: ocipkg-cli --version=0.2.3
43-
- name: Login to ghcr.io
44-
if: matrix.image == 'rust:1.62.1'
45-
run: |
46-
ocipkg login -u ${{ github.repository_owner }} -p ${{ github.token }} https://ghcr.io
47-
53+
args: ocipkg-cli
4854
- uses: actions-rs/cargo@v1
4955
with:
5056
command: test
5157
args: >
5258
--manifest-path=intel-mkl-sys/Cargo.toml
5359
--features=${{ matrix.feature }}
5460
55-
windows:
61+
windows-nuget:
5662
strategy:
5763
fail-fast: false
5864
matrix:

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ In addition to original Keep-a-Changelog, we use following rules:
2727

2828
### Added
2929
- Try ocipkg when MKL not found https://github.com/rust-math/intel-mkl-src/pull/88
30+
- ocipkg 0.2.6, anonymous pulling container https://github.com/rust-math/intel-mkl-src/pull/101
3031

3132
### Removed
3233
- Split container management as another repository https://github.com/rust-math/rust-mkl-container

intel-mkl-src/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@ mkl-dynamic-ilp64-seq = []
3131

3232
[build-dependencies]
3333
anyhow = "1.0.58"
34-
ocipkg = "0.2.3"
34+
ocipkg = "0.2.6"
3535
intel-mkl-tool = { version = "0.8.0-rc.0", path = "../intel-mkl-tool", default-features = false }

0 commit comments

Comments
 (0)