Merge pull request #75 from cpp-lln-lab/dev

[REL] 0.3.1

.github/workflows/run_tests_matlab.yml

@@ -5,36 +5,29 @@ on:
     branches:
       - dev
       - main
-    paths:
-      - '**.m'
-      - '.github/workflows/*.m'
   pull_request:
     branches: ['*']
-    paths:
-      - '**.m'
-      - '.github/workflows/*.m'
   schedule:
     - cron: "1 1 1 * *"
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
 jobs:
-  build:
-    runs-on: ubuntu-20.04
+  tests_matlab:
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Install MATLAB
         uses: matlab-actions/setup-matlab@v1.2.2
         with:
-          # MATLAB release to set up R2020a
           release: R2020a
 
       - name: Install CPP_ROI
         uses: actions/checkout@v3
         with:
           submodules: true
-          fetch-depth: 1
+          fetch-depth: 0
 
       - name: Install SPM
         run: |
@@ -64,4 +57,4 @@ jobs:
           file: coverage.xml # optional
           flags: unittests # optional
           name: codecov-umbrella # optional
-          fail_ci_if_error: true # optional (default = false)
+          fail_ci_if_error: false # optional (default = false)

.gitignore

@@ -2,7 +2,6 @@
 
 *.nii
 *.json
-*.xml
 *.log
 *.mat
 *.html

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "lib/marsbar"]
+	path = lib/marsbar
+	url = https://github.com/marsbar-toolbox/marsbar.git
+	datalad-url = https://github.com/marsbar-toolbox/marsbar.git

CITATION.cff

@@ -2,7 +2,7 @@ cff-version: 1.2.0
 
 title: "CPP ROI"
 
-version: 0.3.0
+version: 0.3.1
 
 abstract: Set of Octave and Matlab functions, demos and scripts to help manage ROIs and to play nice with BIDS datasets.
 

Makefile

@@ -1,4 +1,4 @@
-.PHONY: clean install_dev
+.PHONY: clean install_dev version.txt
 
 clean: clean_lib
 	rm -rf coverage*