Skip to content

Commit 6631706

Browse files
committed
Fix CI
1 parent 6e1575f commit 6631706

3 files changed

Lines changed: 23 additions & 22 deletions

File tree

.github/workflows/CI.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ jobs:
2929
- "pre" # Pre-release/nightly
3030
os:
3131
- ubuntu-latest
32-
- macOS-13 # Intel
32+
- macOS-26-intel # Intel
3333
- windows-latest
3434
arch:
3535
- x64
3636
- x86
3737
exclude:
3838
# Test 32-bit only on Linux
39-
- os: macOS-13
39+
- os: macOS-26-intel
4040
arch: x86
4141
- os: windows-latest
4242
arch: x86
@@ -50,7 +50,7 @@ jobs:
5050
with:
5151
version: ${{ matrix.version }}
5252
arch: ${{ matrix.arch }}
53-
- uses: julia-actions/cache@v2
53+
- uses: julia-actions/cache@v3
5454
- uses: julia-actions/julia-buildpkg@v1
5555
- uses: julia-actions/julia-runtest@v1
5656
- uses: julia-actions/julia-processcoverage@v1

.github/workflows/IntegrationTest.yml

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,53 +13,54 @@ concurrency:
1313

1414
jobs:
1515
test:
16-
name: ${{ matrix.package.repo }}
16+
name: ${{ matrix.package.name }}
1717
runs-on: ${{ matrix.os }}
1818
strategy:
1919
fail-fast: false
2020
matrix:
2121
julia-version: [1]
2222
os: [ubuntu-latest]
2323
package:
24-
- {user: JuliaDiff, repo: ChainRules.jl}
25-
- {user: JuliaDiff, repo: ChainRulesTestUtils.jl}
26-
- {user: JuliaDiff, repo: ChainRulesOverloadGeneration.jl}
27-
- {user: JuliaMath, repo: SpecialFunctions.jl}
28-
- {user: invenia, repo: BlockDiagonals.jl}
29-
- {user: invenia, repo: PDMatsExtras.jl}
30-
- {user: chrisbrahms, repo: Hankel.jl}
31-
- {user: SciML, repo: DiffEqBase.jl}
32-
- {user: SciML, repo: DataInterpolations.jl}
33-
- {user: dfdx, repo: Yota.jl}
34-
- {user: JuliaStats, repo: StatsFuns.jl}
35-
- {user: JuliaStats, repo: LogExpFunctions.jl}
24+
- {user: JuliaDiff, name: ChainRules}
25+
- {user: JuliaDiff, name: ChainRulesTestUtils}
26+
- {user: JuliaDiff, name: ChainRulesOverloadGeneration}
27+
- {user: JuliaMath, name: SpecialFunctions}
28+
- {user: invenia, name: BlockDiagonals}
29+
- {user: invenia, name: PDMatsExtras}
30+
- {user: chrisbrahms, name: Hankel}
31+
- {user: SciML, name: DiffEqBase}
32+
- {user: SciML, name: DataInterpolations}
33+
- {user: dfdx, name: Yota}
34+
- {user: JuliaStats, name: StatsFuns}
35+
- {user: JuliaStats, name: LogExpFunctions}
3636
# Diffractor needs to run on Julia nightly
3737
include:
3838
- julia-version: nightly
3939
os: ubuntu-latest
40-
package: {user: JuliaDiff, repo: Diffractor.jl}
40+
package: {user: JuliaDiff, name: Diffractor}
4141

4242
steps:
4343
- uses: actions/checkout@v6
4444
- uses: julia-actions/setup-julia@v2
4545
with:
4646
version: ${{ matrix.julia-version }}
4747
arch: x64
48+
- uses: julia-actions/cache@v3
4849
- uses: julia-actions/julia-buildpkg@v1
4950
- name: Clone Downstream
5051
uses: actions/checkout@v6
5152
with:
52-
repository: ${{ matrix.package.user }}/${{ matrix.package.repo }}
53+
repository: ${{ matrix.package.user }}/${{ matrix.package.name }}.jl
5354
path: downstream
5455
- name: Load this and run the downstream tests
55-
shell: julia --project=downstream {0}
56+
shell: julia --project=@temp {0}
5657
run: |
5758
using Pkg
5859
try
5960
# force it to use this PR's version of the package
60-
Pkg.develop(PackageSpec(path=".")) # resolver may fail with main deps
61+
Pkg.develop([PackageSpec(path="."), PackageSpec(path="downstream")]) # resolver may fail with main deps
6162
Pkg.update()
62-
Pkg.test() # resolver may fail with test time deps
63+
Pkg.test("${{ matrix.package.name }}") # resolver may fail with test time deps
6364
catch err
6465
err isa Pkg.Resolve.ResolverError || rethrow()
6566
# If we can't resolve that means this is incompatible by SemVer and this is fine

.github/workflows/JuliaNightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- uses: julia-actions/setup-julia@v2
2828
with:
2929
version: nightly
30-
- uses: julia-actions/cache@v2
30+
- uses: julia-actions/cache@v3
3131
- uses: julia-actions/julia-buildpkg@v1
3232
- uses: julia-actions/julia-runtest@v1
3333
- uses: julia-actions/julia-processcoverage@v1

0 commit comments

Comments
 (0)