Skip to content

Commit e25c251

Browse files
authored
Merge pull request #538 from cpp-lln-lab/rc2.0.0
rc2.0.0
2 parents 0689d02 + e99ddc6 commit e25c251

973 files changed

Lines changed: 41891 additions & 25782 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.dockerignore

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# ignoring this might speed up build
2+
# by preventing passing extra content to the docker daemon
3+
4+
.vscode
5+
.git
6+
.github
7+
binder
8+
coverage_html
9+
demos/*/outputs/
10+
demos/*/inputs/
11+
demos/*/cfg/
12+
docs
13+
env
14+
manualTests
15+
templates
16+
tests

.github/release-drafter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
template: |
22
## Release Notes
3-
3+
44
## CHANGES
55
$CHANGES

.github/workflows/check_md_links.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,20 @@ on:
77
branches:
88
- main
99
- dev
10+
paths:
11+
- '**.md'
1012
pull_request:
11-
branches: '*'
13+
branches: ['*']
14+
paths:
15+
- '**.md'
1216

1317
jobs:
1418
markdown-link-check:
1519
runs-on: ubuntu-latest
1620
steps:
1721
- uses: actions/checkout@master
1822
- uses: gaurav-nelson/github-action-markdown-link-check@v1
23+
with:
24+
use-quiet-mode: 'yes'
25+
use-verbose-mode: 'yes'
26+
config-file: 'mlc_config.json'

.github/workflows/miss_hit.yml

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
name: miss_hit
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
- dev
8+
paths:
9+
- '**.m'
10+
- '.github/workflows/miss_hit.yml'
11+
pull_request:
12+
branches: ['*']
13+
paths:
14+
- '**.m'
15+
- '.github/workflows/miss_hit.yml'
16+
jobs:
17+
18+
miss_hit:
19+
20+
runs-on: ubuntu-latest
21+
22+
strategy:
23+
matrix:
24+
command: ["mh_style", "mh_metric --ci && mh_lint"]
25+
fail-fast: true # cancel all jobs if one fails
26+
27+
steps:
28+
29+
- uses: actions/checkout@v3
30+
with:
31+
fetch-depth: 1
32+
33+
- name: Set up Python
34+
uses: actions/setup-python@v3
35+
with:
36+
python-version: 3.9
37+
38+
- name: Install dependencies
39+
run: |
40+
python -m pip install --upgrade pip setuptools
41+
pip3 install -r requirements.txt
42+
43+
- name: ${{ matrix.command }}
44+
run: |
45+
${{ matrix.command }}

.github/workflows/miss_hit_quality.yml

Lines changed: 0 additions & 39 deletions
This file was deleted.

.github/workflows/miss_hit_style.yml

Lines changed: 0 additions & 36 deletions
This file was deleted.
Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
name: system tests with matlab
2+
3+
# Uses the cron schedule for github actions
4+
#
5+
# https://docs.github.com/en/free-pro-team@latest/actions/reference/events-that-trigger-workflows#scheduled-events
6+
#
7+
# ┌───────────── minute (0 - 59)
8+
# │ ┌───────────── hour (0 - 23)
9+
# │ │ ┌───────────── day of the month (1 - 31)
10+
# │ │ │ ┌───────────── month (1 - 12 or JAN-DEC)
11+
# │ │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
12+
# │ │ │ │ │
13+
# │ │ │ │ │
14+
# │ │ │ │ │
15+
# * * * * *
16+
17+
on:
18+
19+
push:
20+
branches:
21+
- main
22+
- dev
23+
paths:
24+
- '**.m'
25+
- '.github/workflows/*system*'
26+
pull_request:
27+
branches:
28+
- main
29+
paths:
30+
- '**.m'
31+
- '.github/workflows/*system*'
32+
schedule:
33+
- cron: "0 0 1,15 * *"
34+
35+
# Allows you to run this workflow manually from the Actions tab
36+
workflow_dispatch:
37+
38+
jobs:
39+
40+
system_tests_matlab:
41+
42+
# only trigger update on upstream repo
43+
if: github.repository_owner == 'cpp-lln-lab'
44+
45+
runs-on: ubuntu-20.04
46+
47+
strategy:
48+
matrix:
49+
script: [moae, facerep, fmriprep]
50+
fail-fast: false
51+
52+
steps:
53+
- name: Install dependencies
54+
run: |
55+
sudo apt-get -y -qq update
56+
sudo apt-get -y install unzip wget
57+
58+
- name: Install MATLAB
59+
uses: matlab-actions/setup-matlab@v1.0.1
60+
with:
61+
# MATLAB release to set up R2020a
62+
release: R2020a
63+
64+
- name: Clone cpp_spm
65+
uses: actions/checkout@v3
66+
with:
67+
submodules: true
68+
fetch-depth: 2
69+
70+
# Prep for later
71+
# - name: Install datalad
72+
# run: |
73+
# sudo apt-get -y -qq update
74+
# sudo apt-get -y install datalad
75+
# - name: Info
76+
# run: |
77+
# datalad --version
78+
# - name: Get fmriprep data
79+
# run: |
80+
# cd demos/
81+
# datalad install --source https://gin.g-node.org/SPM_datasets/spm_moae_fmriprep.git \
82+
# inputs/fmriprep
83+
# cd inputs/fmriprep && datalad get *.json \
84+
# */*/*tsv \
85+
# */*/*json \
86+
# */*/*desc-preproc*.nii.gz \
87+
# */*/*desc-brain*.nii.gz
88+
89+
- name: Get moae fmriprep data from OSF
90+
run: |
91+
mkdir -p demos/MoAE/inputs/
92+
cd demos/MoAE/inputs/
93+
wget https://osf.io/vufjs/download
94+
unzip download
95+
mv moae_fmriprep fmriprep
96+
97+
- name: Install SPM
98+
run: |
99+
git clone https://github.com/spm/spm12.git --depth 1
100+
101+
- name: Copy Macs toolbox to SPM inputs_folder
102+
run: cp -rv lib/MACS spm12/toolbox/MACS
103+
104+
- name: Run ${{ matrix.script }}
105+
uses: matlab-actions/run-command@v1.0.1
106+
with:
107+
command: cd(fullfile(getenv('GITHUB_WORKSPACE'), '.github', 'workflows')); run system_tests_${{ matrix.script }};
Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,46 @@
1-
name: system tests
1+
name: "system tests with octave: failure expected"
22

33
# Uses the cron schedule for github actions
4-
#
4+
#
55
# https://docs.github.com/en/free-pro-team@latest/actions/reference/events-that-trigger-workflows#scheduled-events
6-
#
6+
#
77
# ┌───────────── minute (0 - 59)
88
# │ ┌───────────── hour (0 - 23)
99
# │ │ ┌───────────── day of the month (1 - 31)
1010
# │ │ │ ┌───────────── month (1 - 12 or JAN-DEC)
1111
# │ │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
12-
# │ │ │ │ │
12+
# │ │ │ │ │
1313
# │ │ │ │ │
1414
# │ │ │ │ │
1515
# * * * * *
1616

1717
on:
18+
1819
push:
1920
branches:
2021
- main
22+
- dev
23+
paths:
24+
- '**.m'
2125
pull_request:
22-
branches:
26+
branches:
2327
- 'main'
28+
paths:
29+
- '**.m'
2430
schedule:
25-
- cron: "0 0 1 * *"
31+
- cron: "0 0 1,15 * *"
2632

2733
env:
2834
OCTFLAGS: --no-gui --no-window-system --silent
2935

3036
jobs:
31-
build:
3237

33-
runs-on: ubuntu-20.04
38+
system_tests_octave:
39+
40+
# only trigger update on upstream repo
41+
if: github.repository_owner == 'cpp-lln-lab'
42+
43+
runs-on: ubuntu-latest
3444

3545
steps:
3646

@@ -40,8 +50,8 @@ jobs:
4050
sudo apt-get -y install octave liboctave-dev
4151
sudo apt-get -y install nodejs npm
4252
43-
- name: Clone cpp_spm
44-
uses: actions/checkout@v2
53+
- name: Clone cpp_spm
54+
uses: actions/checkout@v3
4555
with:
4656
submodules: true
4757
fetch-depth: 2
@@ -53,10 +63,8 @@ jobs:
5363
make -C spm12/src PLATFORM=octave
5464
make -C spm12/src PLATFORM=octave install
5565
octave $OCTFLAGS --eval "addpath(fullfile(pwd, 'spm12')); savepath();"
56-
57-
66+
5867
- name: Run system tests
5968
run: |
6069
cd manualTests/
61-
octave $OCTFLAGS --eval "test_moae"
62-
70+
octave $OCTFLAGS --eval "test_moae"

0 commit comments

Comments
 (0)