Skip to content

Commit 84a1d51

Browse files
nHackelnHackel
authored
Merge branch 'master' into nh/breakage
2 parents 758d915 + e6b2df6 commit 84a1d51

8 files changed

Lines changed: 68 additions & 43 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 37 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: MRIReco_All
1+
name: All Packages (latest)
22
on:
33
pull_request:
44
branches:
@@ -10,7 +10,7 @@ on:
1010
tags: '*'
1111
jobs:
1212
test_all_latest:
13-
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
13+
name: ${{ matrix.package.name }} (Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ github.event_name }})
1414
runs-on: ${{ matrix.os }}
1515
strategy:
1616
fail-fast: false
@@ -21,16 +21,23 @@ jobs:
2121
#- 'nightly'
2222
os:
2323
- ubuntu-latest
24-
- macos-latest
25-
- windows-latest
24+
#- macos-latest
25+
#- windows-latest
26+
package:
27+
- {name: MRIReco, path: ., deps: "MRIBase,MRIOperators,MRISimulation,MRISampling"}
28+
- {name: MRIBase, path: MRIBase, deps: ""}
29+
- {name: MRIFiles, path: MRIFiles, deps: ".,MRIBase,MRICoilSensitivities"}
30+
- {name: MRIOperators, path: MRIOperators, deps: "MRIBase,MRISimulation"}
31+
- {name: MRISampling, path: MRISampling, deps: "MRIBase"}
32+
- {name: MRISimulation, path: MRISimulation, deps: "MRIBase,MRIOperators"}
33+
- {name: MRICoilSensitivities, path: MRICoilSensitivities, deps: ".,MRIBase,MRISimulation,MRISampling"}
2634
arch:
2735
- x64
2836
steps:
2937
- uses: actions/checkout@v3
3038
- uses: julia-actions/setup-julia@v1
3139
with:
3240
version: ${{ matrix.version }}
33-
arch: ${{ matrix.arch }}
3441
- uses: actions/cache@v3
3542
env:
3643
cache-name: cache-artifacts
@@ -41,32 +48,38 @@ jobs:
4148
${{ runner.os }}-test-${{ env.cache-name }}-
4249
${{ runner.os }}-test-
4350
${{ runner.os }}-
44-
- name: Install subpackages
45-
shell: julia --color=yes --project=. {0}
51+
- name: Install Package and Dependencies
52+
env:
53+
PKG_PATH: ${{ matrix.package.path }}
54+
DEPS: ${{ matrix.package.deps }}
55+
shell: julia --color=yes {0}
4656
run: |
4757
using Pkg
48-
Pkg.develop([PackageSpec(path=pwd(), subdir="MRIBase")
49-
, PackageSpec(path=pwd(), subdir="MRIFiles")
50-
, PackageSpec(path=pwd(), subdir="MRISampling")
51-
, PackageSpec(path=pwd(), subdir="MRISimulation")
52-
, PackageSpec(path=pwd(), subdir="MRIOperators")
53-
, PackageSpec(path=pwd(), subdir="MRICoilSensitivities")])
54-
- uses: julia-actions/julia-buildpkg@v1
55-
- uses: julia-actions/julia-runtest@v1
56-
- name: Run subpackage tests
57-
shell: julia --color=yes --project=. {0}
58+
Pkg.activate(ENV["PKG_PATH"])
59+
deps = filter(!isempty, split(ENV["DEPS"], ","))
60+
if !isempty(deps)
61+
Pkg.develop(map(dep -> PackageSpec(path = dep), deps))
62+
end
63+
Pkg.instantiate()
64+
- name: Run ${{ matrix.package.name }} tests
65+
env:
66+
PKG_PATH: ${{ matrix.package.path }}
67+
PKG_NAME: ${{ matrix.package.name }}
68+
shell: julia --color=yes {0}
5869
run: |
5970
using Pkg
60-
Pkg.test("MRIBase")
61-
Pkg.test("MRIFiles")
62-
Pkg.test("MRISampling")
63-
Pkg.test("MRISimulation")
64-
Pkg.test("MRIOperators")
65-
Pkg.test("MRICoilSensitivities")
71+
Pkg.activate(ENV["PKG_PATH"])
72+
Pkg.status()
73+
Pkg.test(ENV["PKG_NAME"])
6674
- uses: julia-actions/julia-processcoverage@v1
67-
- uses: codecov/codecov-action@v4.4.0
6875
with:
76+
directories: ${{ matrix.package.path }}
77+
- uses: codecov/codecov-action@v4
78+
with:
79+
file: lcov.info
80+
flags: ${{ matrix.package.name }}
6981
token: ${{ secrets.CODECOV_TOKEN }}
82+
7083
docs:
7184
name: Documentation
7285
runs-on: ubuntu-latest

‎.github/workflows/ci_mribase.yml‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,12 @@ jobs:
5959
- uses: julia-actions/julia-processcoverage@v1
6060
with:
6161
directories: MRIBase/src
62-
- uses: codecov/codecov-action@v4.4.0
62+
- uses: codecov/codecov-action@v4
6363
with:
64+
file: lcov.info
6465
token: ${{ secrets.CODECOV_TOKEN }}
65-
66+
flags: MRIBase
67+
6668
# Based on https://github.com/SciML/OrdinaryDiffEq.jl/blob/master/.github/workflows/Downstream.yml
6769
breakage:
6870
name: Breakage ${{ matrix.package }} (Julia ${{ matrix.julia-version}})
@@ -104,8 +106,4 @@ jobs:
104106
err isa Pkg.Resolve.ResolverError || rethrow()
105107
@info "Not compatible with this release. No need to check for breakage" exception=err
106108
exit(0)
107-
end
108-
- uses: julia-actions/julia-processcoverage@v1
109-
- uses: codecov/codecov-action@v4
110-
with:
111-
token: ${{ secrets.CODECOV_TOKEN }}
109+
end

‎.github/workflows/ci_mricoilsens.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ jobs:
6060
- uses: julia-actions/julia-processcoverage@v1
6161
with:
6262
directories: MRICoilSensitivities/src
63-
- uses: codecov/codecov-action@v4.4.0
63+
- uses: codecov/codecov-action@v4
6464
with:
65-
token: ${{ secrets.CODECOV_TOKEN }}
65+
file: lcov.info
66+
token: ${{ secrets.CODECOV_TOKEN }}
67+
flags: MRICoilSensitivities

‎.github/workflows/ci_mrifiles.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ jobs:
6060
- uses: julia-actions/julia-processcoverage@v1
6161
with:
6262
directories: MRIFiles/src
63-
- uses: codecov/codecov-action@v4.4.0
63+
- uses: codecov/codecov-action@v4
6464
with:
65-
token: ${{ secrets.CODECOV_TOKEN }}
65+
file: lcov.info
66+
token: ${{ secrets.CODECOV_TOKEN }}
67+
flags: MRIFiles

‎.github/workflows/ci_mrioperators.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,9 @@ jobs:
6262
Pkg.test("MRIOperators")
6363
- uses: julia-actions/julia-processcoverage@v1
6464
with:
65-
directories: MRIOperators/src
66-
- uses: codecov/codecov-action@v4.4.0
65+
directories: MRIOperators/src,MRIOperators/ext
66+
- uses: codecov/codecov-action@v4
6767
with:
68-
token: ${{ secrets.CODECOV_TOKEN }}
68+
file: lcov.info
69+
token: ${{ secrets.CODECOV_TOKEN }}
70+
flags: MRIOperators

‎.github/workflows/ci_mrireco.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@ jobs:
5555
- uses: julia-actions/julia-runtest@v1
5656
continue-on-error: ${{ matrix.version == 'nightly' }}
5757
- uses: julia-actions/julia-processcoverage@v1
58-
- uses: codecov/codecov-action@v3
58+
with:
59+
directories: MRIOperators/src,MRIOperators/ext
60+
- uses: codecov/codecov-action@v4
5961
with:
6062
file: lcov.info
63+
token: ${{ secrets.CODECOV_TOKEN }}
64+
flags: MRIReco

‎.github/workflows/ci_mrisampling.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ jobs:
5959
- uses: julia-actions/julia-processcoverage@v1
6060
with:
6161
directories: MRISampling/src
62-
- uses: codecov/codecov-action@v4.4.0
62+
- uses: codecov/codecov-action@v4
6363
with:
64-
token: ${{ secrets.CODECOV_TOKEN }}
64+
file: lcov.info
65+
token: ${{ secrets.CODECOV_TOKEN }}
66+
flags: MRISampling

‎.github/workflows/ci_mrisimulation.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ jobs:
6060
- uses: julia-actions/julia-processcoverage@v1
6161
with:
6262
directories: MRISimulation/src
63-
- uses: codecov/codecov-action@v4.4.0
63+
- uses: codecov/codecov-action@v4
6464
with:
65-
token: ${{ secrets.CODECOV_TOKEN }}
65+
file: lcov.info
66+
token: ${{ secrets.CODECOV_TOKEN }}
67+
flags: MRISimulation

0 commit comments

Comments
 (0)