Skip to content

Commit 863fd18

Browse files
jagotthorek1
andauthored
Julia 1.10 (#13)
* more CI * CI update * get ready for julia 1.10 * finetune CI * Fix CI --------- Co-authored-by: thorek1 <thorek1@users.noreply.github.com>
1 parent 2c96928 commit 863fd18

File tree

2 files changed

+17
-12
lines changed

2 files changed

+17
-12
lines changed

.github/workflows/ci.yml

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,33 @@ on:
99
tags: '*'
1010
jobs:
1111
test:
12+
1213
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
1314
runs-on: ${{ matrix.os }}
1415
strategy:
1516
fail-fast: false
1617
matrix:
1718
version:
18-
- '1.4' # Replace this with the minimum Julia version that your package supports. E.g. if your package requires Julia 1.5 or higher, change this to '1.5'.
19-
- '1' # Leave this line unchanged. '1' will automatically expand to the latest stable 1.x release of Julia.
20-
- 'nightly'
19+
- '1.4'
20+
- '1'
2121
os:
2222
- ubuntu-latest
2323
- macOS-latest
2424
- windows-latest
2525
arch:
2626
- x64
27+
include:
28+
- version: 'nightly'
29+
os: ubuntu-latest
30+
arch: x64
31+
allow_failure: true
2732
steps:
28-
- uses: actions/checkout@v2
29-
- uses: julia-actions/setup-julia@v1
33+
- uses: actions/checkout@v3
34+
- uses: julia-actions/setup-julia@latest
3035
with:
3136
version: ${{ matrix.version }}
3237
arch: ${{ matrix.arch }}
33-
- uses: actions/cache@v1
38+
- uses: actions/cache@v3
3439
env:
3540
cache-name: cache-artifacts
3641
with:
@@ -40,9 +45,9 @@ jobs:
4045
${{ runner.os }}-test-${{ env.cache-name }}-
4146
${{ runner.os }}-test-
4247
${{ runner.os }}-
43-
- uses: julia-actions/julia-buildpkg@v1
44-
- uses: julia-actions/julia-runtest@v1
45-
- uses: julia-actions/julia-processcoverage@v1
46-
- uses: codecov/codecov-action@v1
48+
- uses: julia-actions/julia-buildpkg@latest
49+
- uses: julia-actions/julia-runtest@latest
50+
- uses: julia-actions/julia-processcoverage@latest
51+
- uses: codecov/codecov-action@v3
4752
with:
4853
file: lcov.info

src/ThreadedSparseArrays.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ export ThreadedSparseMatrixCSC
77
using LinearAlgebra
88
import LinearAlgebra: mul!
99
using SparseArrays
10-
import SparseArrays: getcolptr, AbstractSparseMatrixCSC
10+
import SparseArrays: getcolptr, AbstractSparseMatrixCSC, DenseMatrixUnion
1111
const AdjOrTransDenseMatrix = if VERSION < v"1.6.0-rc2"
1212
SparseArrays.AdjOrTransStridedOrTriangularMatrix
1313
else
14-
SparseArrays.AdjOrTransDenseMatrix
14+
Union{DenseMatrixUnion,Adjoint{<:Any,<:DenseMatrixUnion},Transpose{<:Any,<:DenseMatrixUnion}}
1515
end
1616

1717
# * Threading utilities

0 commit comments

Comments
 (0)