From 66f2ab769fd9a9caa044260f8e29be5d44676ef5 Mon Sep 17 00:00:00 2001 From: marcobarilari Date: Thu, 4 Jun 2020 22:37:27 +0200 Subject: [PATCH 01/13] add local path --- getOption.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/getOption.m b/getOption.m index be73fd0d..fcda4976 100644 --- a/getOption.m +++ b/getOption.m @@ -38,7 +38,7 @@ % The directory where the data are located -opt.dataDir = '/home/remi/BIDS/visMotion/derivatives/'; +opt.dataDir = '/users/barilari/visMotion/derivatives/'; % specify the model file that contains the contrasts to compute From 671ae066a11379bf447ec2f273cff8424a6b5737 Mon Sep 17 00:00:00 2001 From: marcobarilari Date: Thu, 4 Jun 2020 22:39:55 +0200 Subject: [PATCH 02/13] add local path --- getOption.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/getOption.m b/getOption.m index fcda4976..54953753 100644 --- a/getOption.m +++ b/getOption.m @@ -38,11 +38,11 @@ % The directory where the data are located -opt.dataDir = '/users/barilari/visMotion/derivatives/'; +opt.dataDir = '/users/barilari/data/visMotion/raw'; % specify the model file that contains the contrasts to compute -opt.model.univariate.file = '/home/remi/github/CPP_BIDS_SPM_pipeline/model-visMotionLoc_smdl.json'; +opt.model.univariate.file = '/users/barilari/github/CPP_BIDS_SPM_pipeline/model-visMotionLoc_smdl.json'; opt.model.multivariate.file = ''; From 0594d46b54cc199be3a428fafd94d1dfd5d6f8eb Mon Sep 17 00:00:00 2001 From: marcobarilari Date: Mon, 8 Feb 2021 16:38:33 +0100 Subject: [PATCH 03/13] add chagelog CI script --- .github/workflows/changelog.yml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .github/workflows/changelog.yml diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml new file mode 100644 index 00000000..5786767d --- /dev/null +++ b/.github/workflows/changelog.yml @@ -0,0 +1,29 @@ +on: + push: + branches: + - master + pull_request: + branches: 'dev' + +jobs: + build: + + language: ruby + + services: + - docker + + before_install: + - docker pull ferrarimarco/github-changelog-generator:latest + - docker run ferrarimarco/github-changelog-generator + + script: + - if (git log -1 --pretty=%s | grep Merge*) && (! git log -1 --pretty=%b | grep REL:) ; then + github_changelog_generator --user cpp-lln-lab --project CPP-SPM --token ${CHANGE_TOKEN} --output ~/build/CHANGES.md --base ~/build/src/pregh-changes.md --header-label "# Changelog" --no-issues --no-issues-wo-labels --no-filter-by-milestone --no-compare-link --pr-label "" --release-branch master + cat ~/build/CHANGES.md + mv ~/build/CHANGES.md ~/build/doc/CHANGES.md + else + echo "Commit or Release, do nothing" + fi + + From afdfe46066806a61b5b538827974322a30d694ce Mon Sep 17 00:00:00 2001 From: marcobarilari Date: Mon, 8 Feb 2021 16:38:51 +0100 Subject: [PATCH 04/13] add code --- .github/workflows/changelog.yml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 5786767d..16a10f2a 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -19,11 +19,19 @@ jobs: script: - if (git log -1 --pretty=%s | grep Merge*) && (! git log -1 --pretty=%b | grep REL:) ; then - github_changelog_generator --user cpp-lln-lab --project CPP-SPM --token ${CHANGE_TOKEN} --output ~/build/CHANGES.md --base ~/build/src/pregh-changes.md --header-label "# Changelog" --no-issues --no-issues-wo-labels --no-filter-by-milestone --no-compare-link --pr-label "" --release-branch master + + github_changelog_generator --user cpp-lln-lab --project CPP-SPM --token ${CHANGE_TOKEN} \ + --output ~/build/CHANGES.md --base ~/build/src/pregh-changes.md --header-label "# Changelog" \ + --no-issues --no-issues-wo-labels --no-filter-by-milestone --no-compare-link --pr-label "" --release-branch master + cat ~/build/CHANGES.md + mv ~/build/CHANGES.md ~/build/doc/CHANGES.md - else + + else + echo "Commit or Release, do nothing" - fi + + fi From dfc94f48263090d82e384f8c64495f800f41fea2 Mon Sep 17 00:00:00 2001 From: marcobarilari Date: Mon, 8 Feb 2021 17:12:44 +0100 Subject: [PATCH 05/13] add mock change --- changelogTest.m | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelogTest.m diff --git a/changelogTest.m b/changelogTest.m new file mode 100644 index 00000000..363c4f9a --- /dev/null +++ b/changelogTest.m @@ -0,0 +1 @@ +% THIS IS A TEST From 93eee2d1b5c3479c114e57b170cbc4760b712559 Mon Sep 17 00:00:00 2001 From: marcobarilari Date: Mon, 8 Feb 2021 18:14:13 +0100 Subject: [PATCH 06/13] update changelog workflow --- .github/workflows/changelog.yml | 40 ++++++++++++++++----------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 16a10f2a..aa929e93 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -1,37 +1,35 @@ +name: Changelog + on: push: branches: - master pull_request: - branches: 'dev' + branches: 0 + - dev jobs: - build: - - language: ruby - - services: - - docker - before_install: - - docker pull ferrarimarco/github-changelog-generator:latest - - docker run ferrarimarco/github-changelog-generator + node-docker: - script: - - if (git log -1 --pretty=%s | grep Merge*) && (! git log -1 --pretty=%b | grep REL:) ; then + runs-on: ubuntu-latest + container: + image: ferrarimarco/github-changelog-generator:1.14.3 - github_changelog_generator --user cpp-lln-lab --project CPP-SPM --token ${CHANGE_TOKEN} \ - --output ~/build/CHANGES.md --base ~/build/src/pregh-changes.md --header-label "# Changelog" \ - --no-issues --no-issues-wo-labels --no-filter-by-milestone --no-compare-link --pr-label "" --release-branch master + steps: + - name: Run changelog builder + run: if (git log -1 --pretty=%s | grep Merge*) && (! git log -1 --pretty=%b | grep REL:) ; then - cat ~/build/CHANGES.md + github_changelog_generator --user cpp-lln-lab --project CPP-SPM --token ${CHANGE_TOKEN} \ + --output ~/build/CHANGES.md --base ~/build/src/pregh-changes.md --header-label "# Changelog" \ + --no-issues --no-issues-wo-labels --no-filter-by-milestone --no-compare-link --pr-label "" --release-branch master - mv ~/build/CHANGES.md ~/build/doc/CHANGES.md + cat ~/build/CHANGES.md - else + mv ~/build/CHANGES.md ~/build/doc/CHANGES.md - echo "Commit or Release, do nothing" + else - fi + echo "Commit or Release, do nothing" - + fi From 1cb524be5756d4157f286a7e05284846cd348511 Mon Sep 17 00:00:00 2001 From: marcobarilari Date: Mon, 8 Feb 2021 18:17:49 +0100 Subject: [PATCH 07/13] fix typo --- .github/workflows/changelog.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index aa929e93..00176aa8 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -5,8 +5,7 @@ on: branches: - master pull_request: - branches: 0 - - dev + branches: '*' jobs: From a58ba3427dcdaabb545048dc7cd5af53e3d4f743 Mon Sep 17 00:00:00 2001 From: marcobarilari Date: Mon, 8 Feb 2021 18:22:10 +0100 Subject: [PATCH 08/13] fix syntax --- .github/workflows/changelog.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 00176aa8..6df48335 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -17,6 +17,7 @@ jobs: steps: - name: Run changelog builder + uses: actions/checkout@v2 run: if (git log -1 --pretty=%s | grep Merge*) && (! git log -1 --pretty=%b | grep REL:) ; then github_changelog_generator --user cpp-lln-lab --project CPP-SPM --token ${CHANGE_TOKEN} \ @@ -27,8 +28,8 @@ jobs: mv ~/build/CHANGES.md ~/build/doc/CHANGES.md - else + else - echo "Commit or Release, do nothing" + echo "Commit or Release, do nothing" - fi + fi From 9a18962f0a394760817b0c06b0624ca3854f1976 Mon Sep 17 00:00:00 2001 From: marcobarilari Date: Mon, 8 Feb 2021 18:28:19 +0100 Subject: [PATCH 09/13] fix CI error --- .github/workflows/changelog.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 6df48335..a94c35bc 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -16,8 +16,9 @@ jobs: image: ferrarimarco/github-changelog-generator:1.14.3 steps: + - uses: actions/checkout@v2 + - name: Run changelog builder - uses: actions/checkout@v2 run: if (git log -1 --pretty=%s | grep Merge*) && (! git log -1 --pretty=%b | grep REL:) ; then github_changelog_generator --user cpp-lln-lab --project CPP-SPM --token ${CHANGE_TOKEN} \ From 20d3eaec1e827d9e0747755fd67c57cdfd8a8a97 Mon Sep 17 00:00:00 2001 From: marcobarilari Date: Tue, 25 Feb 2025 11:03:17 +0100 Subject: [PATCH 10/13] saved UNDO information for reset changes and discarded files --- lib/bids-matlab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bids-matlab b/lib/bids-matlab index c575a111..cc946cf7 160000 --- a/lib/bids-matlab +++ b/lib/bids-matlab @@ -1 +1 @@ -Subproject commit c575a111edfd5fd188f587099990fe9fb0f66866 +Subproject commit cc946cf7d63c5ad42aa7258ef4ef73a2d24c97e5 From e74704a5fb9e36097bdf03e6b753c24d0870cf9e Mon Sep 17 00:00:00 2001 From: marcobarilari Date: Tue, 25 Feb 2025 11:32:49 +0100 Subject: [PATCH 11/13] update bids-matlab submodule to latest commit in main --- lib/bids-matlab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bids-matlab b/lib/bids-matlab index cc946cf7..401691e3 160000 --- a/lib/bids-matlab +++ b/lib/bids-matlab @@ -1 +1 @@ -Subproject commit cc946cf7d63c5ad42aa7258ef4ef73a2d24c97e5 +Subproject commit 401691e30feda34165c64cb28a41c83ed2a2b200 From 3f5bcd73996ffbf3aa7449d59aa19fd0a9c60a45 Mon Sep 17 00:00:00 2001 From: marcobarilari Date: Tue, 25 Feb 2025 11:33:32 +0100 Subject: [PATCH 12/13] update gitmodule file to track main branch in bids-matlab --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 64af0d98..c0ccffa0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "lib/bids-matlab"] path = lib/bids-matlab url = https://github.com/bids-standard/bids-matlab.git - branch = dev + branch = main [submodule "lib/CPP_ROI"] path = lib/CPP_ROI url = https://github.com/cpp-lln-lab/CPP_ROI.git From 73f675011f36ba72588d85acca8ec502fa602e3a Mon Sep 17 00:00:00 2001 From: marcobarilari Date: Tue, 25 Feb 2025 11:38:12 +0100 Subject: [PATCH 13/13] rm files we do not know where they are coming from --- .github/workflows/changelog.yml | 36 --------------------------------- changelogTest.m | 1 - 2 files changed, 37 deletions(-) delete mode 100644 .github/workflows/changelog.yml delete mode 100644 changelogTest.m diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml deleted file mode 100644 index a94c35bc..00000000 --- a/.github/workflows/changelog.yml +++ /dev/null @@ -1,36 +0,0 @@ -name: Changelog - -on: - push: - branches: - - master - pull_request: - branches: '*' - -jobs: - - node-docker: - - runs-on: ubuntu-latest - container: - image: ferrarimarco/github-changelog-generator:1.14.3 - - steps: - - uses: actions/checkout@v2 - - - name: Run changelog builder - run: if (git log -1 --pretty=%s | grep Merge*) && (! git log -1 --pretty=%b | grep REL:) ; then - - github_changelog_generator --user cpp-lln-lab --project CPP-SPM --token ${CHANGE_TOKEN} \ - --output ~/build/CHANGES.md --base ~/build/src/pregh-changes.md --header-label "# Changelog" \ - --no-issues --no-issues-wo-labels --no-filter-by-milestone --no-compare-link --pr-label "" --release-branch master - - cat ~/build/CHANGES.md - - mv ~/build/CHANGES.md ~/build/doc/CHANGES.md - - else - - echo "Commit or Release, do nothing" - - fi diff --git a/changelogTest.m b/changelogTest.m deleted file mode 100644 index 363c4f9a..00000000 --- a/changelogTest.m +++ /dev/null @@ -1 +0,0 @@ -% THIS IS A TEST