Skip to content

Commit 7f8b2cd

Browse files
termoshtttermoshtt
authored
Merge pull request #110 from blas-lapack-rs/update-ci-settings
Use ubuntu 22.04 image on CI
2 parents aa69a8d + 63ac4d7 commit 7f8b2cd

File tree

3 files changed

+99
-99
lines changed

3 files changed

+99
-99
lines changed

‎.github/workflows/openblas-build.yml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99

1010
jobs:
1111
linux:
12-
runs-on: ubuntu-18.04
12+
runs-on: ubuntu-22.04
1313
strategy:
1414
fail-fast: false
1515
matrix:
@@ -22,20 +22,20 @@ jobs:
2222
env:
2323
RUST_BACKTRACE: 1
2424
steps:
25-
- uses: actions/checkout@v1
26-
with:
27-
submodules: 'recursive'
28-
- name: Install gfortran by apt
29-
run: |
30-
apt update
31-
apt install -y gfortran
32-
- name: Common minor tests
33-
uses: actions-rs/cargo@v1
34-
with:
35-
command: test
36-
args: --manifest-path=openblas-build/Cargo.toml
37-
- name: Build test
38-
uses: actions-rs/cargo@v1
39-
with:
40-
command: test
41-
args: ${{ matrix.test_target }} --manifest-path=openblas-build/Cargo.toml -- --ignored
25+
- uses: actions/checkout@v1
26+
with:
27+
submodules: "recursive"
28+
- name: Install gfortran by apt
29+
run: |
30+
apt update
31+
apt install -y gfortran
32+
- name: Common minor tests
33+
uses: actions-rs/cargo@v1
34+
with:
35+
command: test
36+
args: --manifest-path=openblas-build/Cargo.toml
37+
- name: Build test
38+
uses: actions-rs/cargo@v1
39+
with:
40+
command: test
41+
args: ${{ matrix.test_target }} --manifest-path=openblas-build/Cargo.toml -- --ignored

‎.github/workflows/openblas-src.yml‎

Lines changed: 70 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -18,47 +18,47 @@ jobs:
1818
- x64-windows-static
1919
- x64-windows-static-md
2020
steps:
21-
- uses: actions/checkout@v1
22-
- uses: actions/cache@v2
23-
with:
24-
path: ./vcpkg
25-
key: vcpkg-openblas
26-
- name: Install vcpkg
27-
run: |
28-
git clone https://github.com/Microsoft/vcpkg.git --depth 1
29-
cd vcpkg
30-
./bootstrap-vcpkg.bat
31-
- name: Install OpenBLAS by vcpkg
32-
run: |
33-
./vcpkg/vcpkg.exe install openblas:${{ matrix.triple }}
21+
- uses: actions/checkout@v1
22+
- uses: actions/cache@v2
23+
with:
24+
path: ./vcpkg
25+
key: vcpkg-openblas
26+
- name: Install vcpkg
27+
run: |
28+
git clone https://github.com/Microsoft/vcpkg.git --depth 1
29+
cd vcpkg
30+
./bootstrap-vcpkg.bat
31+
- name: Install OpenBLAS by vcpkg
32+
run: |
33+
./vcpkg/vcpkg.exe install openblas:${{ matrix.triple }}
3434
35-
- uses: actions-rs/cargo@v1
36-
name: Test features=system
37-
with:
38-
command: test
39-
args: --features=system --manifest-path=openblas-src/Cargo.toml
40-
env:
41-
VCPKG_ROOT: ${{ github.workspace }}/vcpkg
42-
if: ${{ matrix.triple == 'x64-windows' }}
35+
- uses: actions-rs/cargo@v1
36+
name: Test features=system
37+
with:
38+
command: test
39+
args: --features=system --manifest-path=openblas-src/Cargo.toml
40+
env:
41+
VCPKG_ROOT: ${{ github.workspace }}/vcpkg
42+
if: ${{ matrix.triple == 'x64-windows' }}
4343

44-
- uses: actions-rs/cargo@v1
45-
name: Test features=system,static
46-
with:
47-
command: test
48-
args: --features=system,static --manifest-path=openblas-src/Cargo.toml
49-
env:
50-
VCPKG_ROOT: ${{ github.workspace }}/vcpkg
51-
if: ${{ matrix.triple == 'x64-windows-static-md' }}
44+
- uses: actions-rs/cargo@v1
45+
name: Test features=system,static
46+
with:
47+
command: test
48+
args: --features=system,static --manifest-path=openblas-src/Cargo.toml
49+
env:
50+
VCPKG_ROOT: ${{ github.workspace }}/vcpkg
51+
if: ${{ matrix.triple == 'x64-windows-static-md' }}
5252

53-
- uses: actions-rs/cargo@v1
54-
name: Test features=system,static with crt-static
55-
with:
56-
command: test
57-
args: --features=system,static --manifest-path=openblas-src/Cargo.toml
58-
env:
59-
VCPKG_ROOT: ${{ github.workspace }}/vcpkg
60-
RUSTFLAGS: "-C target-feature=+crt-static"
61-
if: ${{ matrix.triple == 'x64-windows-static' }}
53+
- uses: actions-rs/cargo@v1
54+
name: Test features=system,static with crt-static
55+
with:
56+
command: test
57+
args: --features=system,static --manifest-path=openblas-src/Cargo.toml
58+
env:
59+
VCPKG_ROOT: ${{ github.workspace }}/vcpkg
60+
RUSTFLAGS: "-C target-feature=+crt-static"
61+
if: ${{ matrix.triple == 'x64-windows-static' }}
6262

6363
macos:
6464
runs-on: macos-11
@@ -70,22 +70,22 @@ jobs:
7070
- static
7171
- system
7272
steps:
73-
- uses: actions/checkout@v1
74-
with:
75-
submodules: 'recursive'
76-
- name: Install OpenBLAS by homebrew
77-
run: |
78-
brew install openblas
79-
if: ${{ contains(matrix.feature, 'system') }}
80-
- uses: actions-rs/cargo@v1
81-
with:
82-
command: test
83-
args: >
84-
--features=${{ matrix.feature }}
85-
--manifest-path=openblas-src/Cargo.toml
73+
- uses: actions/checkout@v1
74+
with:
75+
submodules: "recursive"
76+
- name: Install OpenBLAS by homebrew
77+
run: |
78+
brew install openblas
79+
if: ${{ contains(matrix.feature, 'system') }}
80+
- uses: actions-rs/cargo@v1
81+
with:
82+
command: test
83+
args: >
84+
--features=${{ matrix.feature }}
85+
--manifest-path=openblas-src/Cargo.toml
8686
8787
linux:
88-
runs-on: ubuntu-18.04
88+
runs-on: ubuntu-22.04
8989
container:
9090
image: rust
9191
strategy:
@@ -96,21 +96,21 @@ jobs:
9696
- static
9797
- system
9898
steps:
99-
- uses: actions/checkout@v1
100-
with:
101-
submodules: 'recursive'
102-
- name: Install gfortran by apt
103-
run: |
104-
apt update
105-
apt install -y gfortran
106-
- name: Install OpenBLAS by apt
107-
run: |
108-
apt update
109-
apt install -y libopenblas-dev
110-
if: ${{ contains(matrix.feature, 'system') }}
111-
- uses: actions-rs/cargo@v1
112-
with:
113-
command: test
114-
args: >
115-
--features=${{ matrix.feature }}
116-
--manifest-path=openblas-src/Cargo.toml
99+
- uses: actions/checkout@v1
100+
with:
101+
submodules: "recursive"
102+
- name: Install gfortran by apt
103+
run: |
104+
apt update
105+
apt install -y gfortran
106+
- name: Install OpenBLAS by apt
107+
run: |
108+
apt update
109+
apt install -y libopenblas-dev
110+
if: ${{ contains(matrix.feature, 'system') }}
111+
- uses: actions-rs/cargo@v1
112+
with:
113+
command: test
114+
args: >
115+
--features=${{ matrix.feature }}
116+
--manifest-path=openblas-src/Cargo.toml

‎.github/workflows/rust.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@ jobs:
1010
check-format:
1111
runs-on: ubuntu-22.04
1212
steps:
13-
- uses: actions/checkout@v1
14-
- uses: actions-rs/cargo@v1
15-
with:
16-
command: fmt
17-
args: -- --check
13+
- uses: actions/checkout@v1
14+
- uses: actions-rs/cargo@v1
15+
with:
16+
command: fmt
17+
args: -- --check
1818

1919
clippy:
2020
runs-on: ubuntu-22.04
2121
steps:
22-
- uses: actions/checkout@v1
23-
with:
24-
submodules: 'true'
25-
- uses: actions-rs/cargo@v1
26-
with:
27-
command: clippy
22+
- uses: actions/checkout@v1
23+
with:
24+
submodules: "true"
25+
- uses: actions-rs/cargo@v1
26+
with:
27+
command: clippy

0 commit comments

Comments
 (0)