Skip to content

Commit 89aef78

Browse files
Crown421Crown421
committed
Changed tests
1 parent 8da359d commit 89aef78

File tree

2 files changed

+64
-70
lines changed

2 files changed

+64
-70
lines changed

‎.github/workflows/main.yml‎

Lines changed: 32 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ on:
33
push:
44
branches:
55
- master
6+
- dev
67
pull_request:
78

89
jobs:
@@ -18,7 +19,7 @@ jobs:
1819
os:
1920
- ubuntu-latest
2021
- macOS-latest
21-
# - windows-latest
22+
- windows-latest
2223
arch:
2324
- x64
2425
steps:
@@ -27,40 +28,36 @@ jobs:
2728
with:
2829
version: ${{ matrix.version }}
2930
arch: ${{ matrix.arch }}
30-
- run: julia --color=yes --project -e 'using Pkg; Pkg.add(PackageSpec(url=\"https://github.com/JuliaComputing/MKL.jl\")); Pkg.instantiate()'
31-
if: matrix.os == 'windows-latest'
32-
- run: julia --color=yes --project -e 'using Pkg; Pkg.add(PackageSpec(url="https://github.com/JuliaComputing/MKL.jl")); Pkg.instantiate()'
33-
if: matrix.os != 'windows-latest'
3431
- uses: julia-actions/julia-buildpkg@latest
3532
- uses: julia-actions/julia-runtest@latest
3633

37-
testAptMKL:
38-
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }}
39-
runs-on: ${{ matrix.os }}
40-
strategy:
41-
matrix:
42-
version:
43-
- '1.0'
44-
- '1.3'
45-
os:
46-
- ubuntu-latest
47-
arch:
48-
- x64
49-
env:
50-
LD_LIBRARY_PATH: /opt/intel/compilers_and_libraries_2019.4.243/linux/mkl/lib/intel64_lin/
51-
steps:
52-
- name: Install MKL via apt
53-
run: |
54-
curl https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB > GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB
55-
sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB
56-
rm GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB
57-
sudo sh -c 'echo deb https://apt.repos.intel.com/mkl all main > /etc/apt/sources.list.d/intel-mkl.list'
58-
sudo apt-get update
59-
sudo apt-get install -y intel-mkl-64bit-2019.4-070
60-
- uses: actions/checkout@v2
61-
- uses: julia-actions/setup-julia@latest
62-
with:
63-
version: ${{ matrix.version }}
64-
arch: ${{ matrix.arch }}
65-
- uses: julia-actions/julia-buildpkg@latest
66-
- uses: julia-actions/julia-runtest@latest
34+
# testAptMKL:
35+
# name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }}
36+
# runs-on: ${{ matrix.os }}
37+
# strategy:
38+
# matrix:
39+
# version:
40+
# - '1.0'
41+
# - '1.3'
42+
# os:
43+
# - ubuntu-latest
44+
# arch:
45+
# - x64
46+
# env:
47+
# LD_LIBRARY_PATH: /opt/intel/compilers_and_libraries_2019.4.243/linux/mkl/lib/intel64_lin/
48+
# steps:
49+
# - name: Install MKL via apt
50+
# run: |
51+
# curl https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB > GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB
52+
# sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB
53+
# rm GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB
54+
# sudo sh -c 'echo deb https://apt.repos.intel.com/mkl all main > /etc/apt/sources.list.d/intel-mkl.list'
55+
# sudo apt-get update
56+
# sudo apt-get install -y intel-mkl-64bit-2019.4-070
57+
# - uses: actions/checkout@v2
58+
# - uses: julia-actions/setup-julia@latest
59+
# with:
60+
# version: ${{ matrix.version }}
61+
# arch: ${{ matrix.arch }}
62+
# - uses: julia-actions/julia-buildpkg@latest
63+
# - uses: julia-actions/julia-runtest@latest

‎.github/workflows/nightly.yml‎

Lines changed: 32 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ on:
33
push:
44
branches:
55
- master
6+
- dev
67
pull_request:
78
schedule:
89
- cron: '1 0 1,15 * *'
@@ -19,7 +20,7 @@ jobs:
1920
os:
2021
- ubuntu-latest
2122
- macOS-latest
22-
# - windows-latest
23+
- windows-latest
2324
arch:
2425
- x64
2526
steps:
@@ -28,40 +29,36 @@ jobs:
2829
with:
2930
version: ${{ matrix.version }}
3031
arch: ${{ matrix.arch }}
31-
- run: julia --color=yes --project -e 'using Pkg; Pkg.add(PackageSpec(url=\"https://github.com/JuliaComputing/MKL.jl\")); Pkg.instantiate()'
32-
if: matrix.os == 'windows-latest'
33-
- run: julia --color=yes --project -e 'using Pkg; Pkg.add(PackageSpec(url="https://github.com/JuliaComputing/MKL.jl")); Pkg.instantiate()'
34-
if: matrix.os != 'windows-latest'
3532
- uses: julia-actions/julia-buildpkg@latest
3633
- uses: julia-actions/julia-runtest@latest
3734

38-
testAptMKL:
39-
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }}
40-
runs-on: ${{ matrix.os }}
41-
strategy:
42-
matrix:
43-
version:
44-
- 'nightly'
45-
os:
46-
- ubuntu-latest
47-
arch:
48-
- x64
49-
env:
50-
LD_LIBRARY_PATH: /opt/intel/compilers_and_libraries_2019.4.243/linux/mkl/lib/intel64_lin/
51-
steps:
52-
- name: Install MKL via apt
53-
run: |
54-
curl https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB > GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB
55-
sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB
56-
rm GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB
57-
sudo sh -c 'echo deb https://apt.repos.intel.com/mkl all main > /etc/apt/sources.list.d/intel-mkl.list'
58-
sudo apt-get update
59-
sudo apt-get install -y intel-mkl-64bit-2019.4-070
60-
source /opt/intel/mkl/bin/mklvars.sh intel64
61-
- uses: actions/checkout@v2
62-
- uses: julia-actions/setup-julia@latest
63-
with:
64-
version: ${{ matrix.version }}
65-
arch: ${{ matrix.arch }}
66-
- uses: julia-actions/julia-buildpkg@latest
67-
- uses: julia-actions/julia-runtest@latest
35+
# testAptMKL:
36+
# name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }}
37+
# runs-on: ${{ matrix.os }}
38+
# strategy:
39+
# matrix:
40+
# version:
41+
# - 'nightly'
42+
# os:
43+
# - ubuntu-latest
44+
# arch:
45+
# - x64
46+
# env:
47+
# LD_LIBRARY_PATH: /opt/intel/compilers_and_libraries_2019.4.243/linux/mkl/lib/intel64_lin/
48+
# steps:
49+
# - name: Install MKL via apt
50+
# run: |
51+
# curl https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB > GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB
52+
# sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB
53+
# rm GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB
54+
# sudo sh -c 'echo deb https://apt.repos.intel.com/mkl all main > /etc/apt/sources.list.d/intel-mkl.list'
55+
# sudo apt-get update
56+
# sudo apt-get install -y intel-mkl-64bit-2019.4-070
57+
# source /opt/intel/mkl/bin/mklvars.sh intel64
58+
# - uses: actions/checkout@v2
59+
# - uses: julia-actions/setup-julia@latest
60+
# with:
61+
# version: ${{ matrix.version }}
62+
# arch: ${{ matrix.arch }}
63+
# - uses: julia-actions/julia-buildpkg@latest
64+
# - uses: julia-actions/julia-runtest@latest

0 commit comments

Comments
 (0)