Skip to content

Commit c431350

Browse files
committed
Merge remote-tracking branch 'cpp-lln-lab/master'
2 parents ca7541d + 3f0cfbc commit c431350

Some content is hidden

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

42 files changed

+891
-480
lines changed

.github/workflows/moxunit.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
8+
branches: '*'
9+
10+
jobs:
11+
build:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: actions/checkout@v2
15+
with:
16+
submodules: true
17+
fetch-depth: 1
18+
- name: MOxUnit Action
19+
uses: joergbrech/[email protected]
20+
with:
21+
tests: tests
22+
src: src
23+
with_coverage: true
24+
cover_xml_file: coverage.xml
25+
- name: Code coverage
26+
uses: codecov/codecov-action@v1
27+
with:
28+
token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos
29+
file: coverage.xml # optional
30+
flags: unittests # optional
31+
name: codecov-umbrella # optional
32+
fail_ci_if_error: true # optional (default = false)

.gitignore

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,25 @@
1-
1+
# exclude mac file
22
*DS_Store
33

4+
# exclude matlab autosaves and octave workspace info
45
*.m~
56
*octave-workspace
67

78
# exclude content of logfiles folders
9+
tests/output/*
10+
manualTests/output/*
11+
output/*
812
*.tsv
913
*.mat
1014

11-
check_my_code_report.txt
15+
# exclude temp files from tests and coverage
16+
tests/coverage*
17+
tests/test_code_report.txt
1218
test_code_report.txt
1319

14-
output/**
20+
# exclude report from check_my_code
21+
check_my_code_report.txt
22+
23+
24+
25+

.travis.yml

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,47 @@
11
# Travis CI (https://travis-ci.org/)
22

33
language: c
4-
dist: bionic
4+
dist: bionic # based on bionic beaver ubuntu distribution
55
cache:
66
apt: true # only works with Pro version
77

88
env:
9-
global:
9+
global: # define environment variables for bash
1010
- OCTFLAGS="--no-gui --no-window-system --silent"
1111

1212
before_install:
1313
- travis_retry sudo apt-get -y -qq update
14+
# install octave
1415
- travis_retry sudo apt-get -y install octave
1516
- travis_retry sudo apt-get -y install liboctave-dev
17+
# install javascript
1618
- travis_retry sudo apt-get -y install nodejs
1719
- travis_retry sudo apt-get -y install npm
20+
# install miss_hit linter
1821
- cd .. && git clone https://github.com/florianschanda/miss_hit.git && export PATH=$PATH:`pwd`/miss_hit && cd CPP_BIDS
1922

2023

2124
install:
22-
# make octave file for JSONio
25+
# make octave file the JSONio submodule
2326
- cd lib/JSONio; mkoctfile --mex jsonread.c jsmn.c -DJSMN_PARENT_LINKS; cd ../..
2427
- octave $OCTFLAGS --eval "addpath (pwd); savepath ();"
2528
# Install BIDS-Validator
2629
- sudo npm install -g bids-validator
2730

2831
before_script:
32+
# Add to src functions to path
33+
- octave $OCTFLAGS --eval "addpath(genpath(fullfile(pwd, 'src'))); savepath ();"
2934
# Change current directory
30-
- cd tests
35+
- cd manualTests
3136

3237
jobs:
3338
include:
34-
- stage: "Tests"
35-
name: "Unit and integration Tests"
36-
script: octave $OCTFLAGS --eval "results = runTests; assert(all(~[results.Failed]))"
39+
# - stage: "Tests"
40+
# name: "Unit and integration Tests"
41+
# script: octave $OCTFLAGS --eval "results = runTests; assert(all(~[results.Failed]))"
3742
- stage: "BIDS validator"
3843
name: "Create and check dataset"
39-
script: cd manualTests && octave $OCTFLAGS --eval "test_makeRawDataset" && bids-validator `pwd`/output/rawdata/ --ignoreNiftiHeaders
44+
script: octave $OCTFLAGS --eval "test_makeRawDataset" && bids-validator `pwd`/output/rawdata/ --ignoreNiftiHeaders
4045
- stage: "Linter"
4146
name: "miss_hit"
4247
script: cd .. && mh_style `pwd`

0 commit comments

Comments
 (0)