Skip to content

Commit db4ca09

Browse files
committed
update github action
1 parent 3ae346e commit db4ca09

File tree

3 files changed

+20
-15
lines changed

3 files changed

+20
-15
lines changed

.github/workflows/run_tests.yml

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,38 +6,36 @@ on:
66
- master
77
- main
88
- dev
9+
910
pull_request:
1011
branches: '*'
1112

1213
jobs:
1314
build:
14-
1515
runs-on: ubuntu-20.04
1616

1717
steps:
1818

19+
- name: Install dependencies
20+
run: |
21+
sudo apt-get -y -qq update
22+
sudo apt-get -y install octave liboctave-dev
23+
1924
- name: Clone spm_2_bids
2025
uses: actions/checkout@v2
2126
with:
2227
submodules: true
23-
fetch-depth: 2
24-
25-
- name: Install JSONio
26-
run: |
27-
git clone git://github.com/gllmflndn/JSONio.git --depth 1
28-
cd JSONio
29-
mkoctfile --mex jsonread.c jsmn.c -DJSMN_PARENT_LINKS
30-
cd ..
28+
fetch-depth: 2
3129

32-
- name: get bids-matlab and set up paths
30+
- name: get bids-matlab and JSONio
3331
run: |
34-
make install_dev
32+
make install_dev_octave
3533
3634
- name: MOxUnit Action
3735
uses: joergbrech/moxunit-action@master
3836
with:
3937
tests: tests # files or directories containing the MOxUnit test cases
40-
src: src lib/bids-matlab # directories to be added to the Octave search path before running the tests.
38+
src: src lib/bids-matlab lib/JSONio # directories to be added to path before running the tests.
4139
ext: tests/utils # External resources to add to the search put (excluded from coverage)
4240
# data: # Directory for test data
4341
with_coverage: true

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@
66
env/
77

88
lib/bids-matlab
9+
lib/JSONio
910

1011
coverage_html
1112
coverage.xml
1213
test_report.log
1314

14-
15-
1615
## MATLAB / OCTAVE gitignore template
1716

1817
# From : https://github.com/github/gitignore/blob/master/Global/MATLAB.gitignore

Makefile

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
install_dev:
22
git clone https://github.com/bids-standard/bids-matlab.git lib/bids-matlab
33
cd lib/bids-matlab && git checkout dev
4+
git clone git://github.com/gllmflndn/JSONio.git --depth 1 lib/JSONio
5+
6+
install_dev_octave:
7+
git clone https://github.com/bids-standard/bids-matlab.git lib/bids-matlab
8+
cd lib/bids-matlab && git checkout dev
9+
git clone git://github.com/gllmflndn/JSONio.git --depth 1 lib/JSONio
10+
cd lib/JSONio && mkoctfile --mex jsonread.c jsmn.c -DJSMN_PARENT_LINKS
411

512
clean:
6-
rm -rf lib/bids-matlab
13+
rm -rf lib/bids-matlab
14+
rm -rf lib/JSONio

0 commit comments

Comments
 (0)