Skip to content

Commit 2be601d

Browse files
fix CI
1 parent bef5225 commit 2be601d

File tree

3 files changed

+20
-27
lines changed

3 files changed

+20
-27
lines changed

.github/workflows/Documentation.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
name: Documentation
2+
23
on:
34
push:
45
branches:
@@ -14,10 +15,14 @@ jobs:
1415
- uses: julia-actions/setup-julia@latest
1516
with:
1617
version: '1'
17-
- run: julia --project -e 'using Pkg; Pkg.develop([PackageSpec(path=joinpath(pwd(), "lib", "ArrayInterfaceCore"))])'
18-
- uses: julia-actions/julia-buildpkg@latest
19-
- run: julia --project=docs/ -e 'using Pkg; Pkg.develop([PackageSpec(path=joinpath(pwd(), "lib", "ArrayInterfaceCore"))]); Pkg.instantiate()'
20-
- uses: julia-actions/julia-docdeploy@releases/v1
18+
- name: Install dependencies
19+
run: julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'
20+
- name: Build and deploy
2121
env:
22-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
23-
DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }}
22+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # For authentication with GitHub Actions token
23+
DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }} # For authentication with SSH deploy key
24+
run: julia --project=docs/ --code-coverage=user docs/make.jl
25+
- uses: julia-actions/julia-processcoverage@v1
26+
- uses: codecov/codecov-action@v1
27+
with:
28+
file: lcov.info

.github/workflows/Downstream.yml

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,9 @@ jobs:
1717
julia-version: [1,1.6]
1818
os: [ubuntu-latest]
1919
package:
20-
- {user: JuliaDiff, repo: SparseDiffTools.jl, group: Core}
21-
- {user: SciML, repo: SciMLBase.jl, group: Core}
22-
- {user: SciML, repo: DiffEqBase.jl, group: Core}
23-
- {user: SciML, repo: DiffEqBase.jl, group: Downstream}
24-
- {user: SciML, repo: DiffEqBase.jl, group: Downstream2}
25-
- {user: SciML, repo: SciMLSensitivity.jl, group: Core1}
26-
- {user: SciML, repo: SciMLSensitivity.jl, group: Core2}
27-
- {user: SciML, repo: SciMLSensitivity.jl, group: Core3}
28-
- {user: SciML, repo: SciMLSensitivity.jl, group: Core4}
29-
- {user: SciML, repo: SciMLSensitivity.jl, group: Core5}
30-
- {user: SciML, repo: OrdinaryDiffEq.jl, group: Core}
31-
- {user: SciML, repo: OrdinaryDiffEq.jl, group: Interface}
32-
- {user: SciML, repo: DelayDiffEq.jl, group: Interface}
3320
- {user: JuliaSIMD, repo: VectorizationBase.jl, group: Interface}
3421
- {user: JuliaSIMD, repo: LoopVectorization.jl, group: Downstream3}
22+
3523
steps:
3624
- uses: actions/checkout@v2
3725
- uses: julia-actions/setup-julia@v1
@@ -45,18 +33,14 @@ jobs:
4533
repository: ${{ matrix.package.user }}/${{ matrix.package.repo }}
4634
path: downstream
4735
- name: Load this and run the downstream tests
48-
shell: julia --color=yes {0}
36+
shell: julia --color=yes --project=downstream {0}
4937
run: |
5038
using Pkg
5139
try
5240
# force it to use this PR's version of the package
5341
Pkg.develop(PackageSpec(path=".")) # resolver may fail with main deps
54-
Pkg.develop(Pkg.PackageSpec(path=joinpath(pwd(), "lib", "ArrayInterfaceCore")))
55-
Pkg.develop(Pkg.PackageSpec(path=joinpath(pwd(), "lib", "ArrayInterfaceOffsetArrays")))
56-
Pkg.develop(Pkg.PackageSpec(path=joinpath(pwd(), "lib", "ArrayInterfaceStaticArrays")))
57-
Pkg.activate("downstream")
5842
Pkg.update()
59-
Pkg.test() # resolver may fail with test time deps
43+
Pkg.test(coverage=true) # resolver may fail with test time deps
6044
catch err
6145
err isa Pkg.Resolve.ResolverError || rethrow()
6246
# If we can't resolve that means this is incompatible by SemVer and this is fine
@@ -65,3 +49,7 @@ jobs:
6549
@info "Not compatible with this release. No problem." exception=err
6650
exit(0) # Exit immediately, as a success
6751
end
52+
- uses: julia-actions/julia-processcoverage@v1
53+
- uses: codecov/codecov-action@v1
54+
with:
55+
file: lcov.info

src/StaticArrayInterface.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -481,8 +481,8 @@ include("broadcast.jl")
481481
import Requires
482482
@static if !isdefined(Base, :get_extension)
483483
function __init__()
484-
Requires.@require StaticArrays = "90137ffa-7385-5640-81b9-e52037218182" begin include("../ext/ArrayInterfaceStaticArraysExt.jl") end
485-
Requires.@require OffsetArrays = "6fe1bfb0-de20-5000-8ca7-80f57d26f881" begin include("../ext/ArrayInterfaceOffsetArraysExt.jl") end
484+
Requires.@require StaticArrays = "90137ffa-7385-5640-81b9-e52037218182" begin include("../ext/StaticArrayInterfaceStaticArraysExt.jl") end
485+
Requires.@require OffsetArrays = "6fe1bfb0-de20-5000-8ca7-80f57d26f881" begin include("../ext/StaticArrayInterfaceOffsetArraysExt.jl") end
486486
end
487487
end
488488

0 commit comments

Comments
 (0)