Skip to content

Commit 791374b

Browse files
committed
Merge branch 'dev' of https://github.com/cpp-lln-lab/CPP_ROI into olf
2 parents 353e51f + 03a4c35 commit 791374b

File tree

7 files changed

+230
-1
lines changed

7 files changed

+230
-1
lines changed

.all-contributorsrc

+87
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
{
2+
"projectName": "CPP_ROI",
3+
"projectOwner": "cpp-lln-lab",
4+
"repoType": "github",
5+
"repoHost": "https://github.com",
6+
"files": [
7+
"README.md"
8+
],
9+
"imageSize": 100,
10+
"commit": true,
11+
"commitConvention": "none",
12+
"contributors": [
13+
{
14+
"login": "marcobarilari",
15+
"name": "Marco Barilari",
16+
"contributions": [
17+
"code",
18+
"doc",
19+
"ideas"
20+
],
21+
"profile": "https://github.com/marcobarilari",
22+
"avatar_url": [
23+
"https://avatars.githubusercontent.com/u/38101692?v=4"
24+
]
25+
},
26+
{
27+
"login": "Remi-Gau",
28+
"name": "Remi Gau",
29+
"contributions": [
30+
"code",
31+
"doc",
32+
"infra",
33+
"design",
34+
"review",
35+
"bug",
36+
"test"
37+
],
38+
"profile": "https://github.com/Remi-Gau",
39+
"avatar_url": [
40+
"https://avatars.githubusercontent.com/u/6961185?v=4"
41+
]
42+
},
43+
{
44+
"login": "JeanneCaronGuyon ",
45+
"name": "Jeanne Caron-Guyon ",
46+
"avatar_url": "https://avatars.githubusercontent.com/u/8718798?v=4",
47+
"profile": "https://github.com/JeanneCaronGuyon",
48+
"contributions": [
49+
"ideas",
50+
"userTesting"
51+
]
52+
},
53+
{
54+
"login": "iqrashahzad14",
55+
"name": "Iqra Shahzad",
56+
"avatar_url": "https://avatars.githubusercontent.com/u/75671348?v=4",
57+
"profile": "https://github.com/iqrashahzad14",
58+
"contributions": [
59+
"userTesting"
60+
]
61+
},
62+
{
63+
"login": "fedefalag",
64+
"name": "Federica Falagiarda",
65+
"avatar_url": "https://avatars2.githubusercontent.com/u/50373329?v=4",
66+
"profile": "https://github.com/fedefalag",
67+
"contributions": [
68+
"bug",
69+
"userTesting"
70+
]
71+
},
72+
{
73+
"login": "CerenB",
74+
"name": "Ceren Battal",
75+
"contributions": [
76+
"code",
77+
"review",
78+
"userTesting"
79+
],
80+
"profile": "https://github.com/CerenB",
81+
"avatar_url": [
82+
"https://avatars.githubusercontent.com/u/10451654?v=4"
83+
]
84+
}
85+
],
86+
"contributorsPerLine": 7
87+
}

.github/workflows/miss_hit.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
fetch-depth: 1
3232

3333
- name: Set up Python
34-
uses: actions/setup-python@v2
34+
uses: actions/setup-python@v3
3535
with:
3636
python-version: 3.9
3737

.github/workflows/run_tests_matlab.yml

+6
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,14 @@ on:
55
branches:
66
- dev
77
- main
8+
paths:
9+
- '**.m'
10+
- '.github/workflows/*.m'
811
pull_request:
912
branches: ['*']
13+
paths:
14+
- '**.m'
15+
- '.github/workflows/*.m'
1016
schedule:
1117
- cron: "1 1 1 * *"
1218

+90
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
name: allcontributors-auto-detect
2+
3+
on:
4+
schedule:
5+
# Run nightly 1am
6+
- cron: 0 1 * * *
7+
8+
# You can also have it check for changes on each push to master
9+
push:
10+
branches:
11+
- main
12+
- dev
13+
14+
jobs:
15+
Update:
16+
name: Generate
17+
runs-on: ubuntu-latest
18+
steps:
19+
- name: Checkout Repository
20+
uses: actions/checkout@v2
21+
- name: Tributors Update
22+
23+
# Important! Update to release https://github.com/con/tributors
24+
uses: con/tributors@master
25+
env:
26+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
27+
with:
28+
29+
# Single text list (space separated) of parsers, leave unset to auto-detect
30+
parsers: unset
31+
32+
# INFO, DEBUG, ERROR, WARNING, etc.
33+
log_level: DEBUG
34+
35+
# If files already exist and an init is done, force overwrite
36+
force: true
37+
38+
# the minimum number of contributions required to add a user
39+
threshold: 1
40+
41+
- name: Checkout New Branch
42+
env:
43+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
44+
BRANCH_AGAINST: "main"
45+
run: |
46+
printf "GitHub Actor: ${GITHUB_ACTOR}\n"
47+
export BRANCH_FROM="contributors/update-$(date '+%Y-%m-%d')"
48+
git remote set-url origin "https://x-access-token:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git"
49+
50+
BRANCH_EXISTS=$(git ls-remote --heads origin ${BRANCH_FROM})
51+
if [[ -z ${BRANCH_EXISTS} ]]; then
52+
printf "Branch does not exist in remote.\n"
53+
else
54+
printf "Branch already exists in remote.\n"
55+
exit 1
56+
fi
57+
git branch
58+
git checkout -b "${BRANCH_FROM}" || git checkout "${BRANCH_FROM}"
59+
git branch
60+
61+
git config --global user.name "github-actions"
62+
git config --global user.email "[email protected]"
63+
64+
git status
65+
66+
# Make sure to add new files or path/*
67+
git add .tributors
68+
git add README.md
69+
git add .all-contributorsrc
70+
71+
if git diff-index --quiet HEAD --; then
72+
export OPEN_PULL_REQUEST=0
73+
printf "No changes\n"
74+
else
75+
export OPEN_PULL_REQUEST=1
76+
printf "Changes\n"
77+
git commit -a -m "Automated deployment to update contributors $(date '+%Y-%m-%d')"
78+
git push origin "${BRANCH_FROM}"
79+
fi
80+
echo "::set-env name=OPEN_PULL_REQUEST::${OPEN_PULL_REQUEST}"
81+
echo "::set-env name=PULL_REQUEST_FROM_BRANCH::${BRANCH_FROM}"
82+
echo "::set-env name=PULL_REQUEST_TITLE::[tributors] ${BRANCH_FROM}"
83+
echo "::set-env name=PULL_REQUEST_BODY::Updating tributors automated pull request."
84+
85+
- name: Open Pull Request
86+
uses: vsoch/[email protected]
87+
if: ${{ env.OPEN_PULL_REQUEST == '1' }}
88+
env:
89+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
90+
PULL_REQUEST_BRANCH: "master"

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
*.mat
88
*.html
99

10+
node_modules
11+
1012
# ignore content of the build folder of the doc
1113
docs/build/*
1214

.tributors

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"marcobarilari": {
3+
"name": "Marco Barilari",
4+
"blog": "https://github.com/marcobarilari"
5+
},
6+
"Remi-Gau": {
7+
"name": "Remi Gau",
8+
"blog": "https://github.com/Remi-Gau"
9+
},
10+
"JeanneCaronGuyon ": {
11+
"name": "Jeanne Caron-Guyon ",
12+
"blog": "https://github.com/JeanneCaronGuyon"
13+
},
14+
"iqrashahzad14": {
15+
"name": "Iqra Shahzad",
16+
"blog": "https://github.com/iqrashahzad14"
17+
},
18+
"fedefalag": {
19+
"name": "Federica Falagiarda",
20+
"blog": "https://github.com/fedefalag"
21+
},
22+
"CerenB": {
23+
"name": "Ceren Battal",
24+
"blog": "https://github.com/CerenB"
25+
}
26+
}

README.md

+18
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[![miss_hit](https://github.com/cpp-lln-lab/CPP_ROI/actions/workflows/miss_hit.yml/badge.svg)](https://github.com/cpp-lln-lab/CPP_ROI/actions/workflows/miss_hit.yml)
22
[![tests and coverage with matlab](https://github.com/cpp-lln-lab/CPP_ROI/actions/workflows/run_tests_matlab.yml/badge.svg)](https://github.com/cpp-lln-lab/CPP_ROI/actions/workflows/run_tests_matlab.yml)
33
[![codecov](https://codecov.io/gh/cpp-lln-lab/CPP_ROI/branch/main/graph/badge.svg?token=8IoRQtbFUV)](https://codecov.io/gh/cpp-lln-lab/CPP_ROI)
4+
![All Contributors](https://img.shields.io/badge/all_contributors-4-orange.svg?style=flat-square)
45

56
# CPP ROI
67

@@ -71,3 +72,20 @@ Also includes:
7172

7273
- Yeo's 7 networks "atlas"
7374
<!-- add REF and URL -->
75+
76+
<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
77+
<!-- prettier-ignore-start -->
78+
<!-- markdownlint-disable -->
79+
<table>
80+
<tr>
81+
<td align="center"><a href="https://github.com/marcobarilari"><img src="https://avatars.githubusercontent.com/u/38101692?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Marco Barilari</b></sub></a><br /><a href="https://github.com/cpp-lln-lab/CPP_ROI/commits?author=marcobarilari" title="Code">💻</a></td>
82+
<td align="center"><a href="https://github.com/Remi-Gau"><img src="https://avatars.githubusercontent.com/u/6961185?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Remi Gau</b></sub></a><br /><a href="https://github.com/cpp-lln-lab/CPP_ROI/commits?author=Remi-Gau" title="Code">💻</a></td>
83+
<td align="center"><a href="https://github.com/fedefalag"><img src="https://avatars2.githubusercontent.com/u/50373329?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Federica Falagiarda</b></sub></a><br /><a href="https://github.com/cpp-lln-lab/CPP_ROI/issues?q=author%3Afedefalag" title="Bug reports">🐛</a> <a href="#userTesting-fedefalag" title="User Testing">📓</a></td>
84+
<td align="center"><a href="https://github.com/CerenB"><img src="https://avatars.githubusercontent.com/u/10451654?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ceren Battal</b></sub></a><br /><a href="https://github.com/cpp-lln-lab/CPP_ROI/commits?author=CerenB" title="Code">💻</a></td>
85+
</tr>
86+
</table>
87+
88+
<!-- markdownlint-restore -->
89+
<!-- prettier-ignore-end -->
90+
91+
<!-- ALL-CONTRIBUTORS-LIST:END -->

0 commit comments

Comments
 (0)