Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into fix/117
Browse files Browse the repository at this point in the history
  • Loading branch information
Remi-Gau committed Mar 15, 2024
2 parents 4ceb2c8 + 2906e31 commit 695166b
Show file tree
Hide file tree
Showing 4 changed files with 109 additions and 95 deletions.
181 changes: 96 additions & 85 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
@@ -1,87 +1,98 @@
{
"projectName": "CPP_ROI",
"projectOwner": "cpp-lln-lab",
"repoType": "github",
"repoHost": "https://github.com",
"files": [
"README.md"
],
"imageSize": 100,
"commit": true,
"commitConvention": "none",
"contributors": [
{
"login": "marcobarilari",
"name": "Marco Barilari",
"contributions": [
"code",
"doc",
"ideas"
],
"profile": "https://github.com/marcobarilari",
"avatar_url": [
"https://avatars.githubusercontent.com/u/38101692?v=4"
]
},
{
"login": "Remi-Gau",
"name": "Remi Gau",
"contributions": [
"code",
"doc",
"infra",
"design",
"review",
"bug",
"test"
],
"profile": "https://github.com/Remi-Gau",
"avatar_url": [
"https://avatars.githubusercontent.com/u/6961185?v=4"
]
},
{
"login": "JeanneCaronGuyon ",
"name": "Jeanne Caron-Guyon ",
"avatar_url": "https://avatars.githubusercontent.com/u/8718798?v=4",
"profile": "https://github.com/JeanneCaronGuyon",
"contributions": [
"ideas",
"userTesting"
]
},
{
"login": "iqrashahzad14",
"name": "Iqra Shahzad",
"avatar_url": "https://avatars.githubusercontent.com/u/75671348?v=4",
"profile": "https://github.com/iqrashahzad14",
"contributions": [
"userTesting"
]
},
{
"login": "fedefalag",
"name": "Federica Falagiarda",
"avatar_url": "https://avatars2.githubusercontent.com/u/50373329?v=4",
"profile": "https://github.com/fedefalag",
"contributions": [
"bug",
"userTesting"
]
},
{
"login": "CerenB",
"name": "Ceren Battal",
"contributions": [
"code",
"review",
"userTesting"
],
"profile": "https://github.com/CerenB",
"avatar_url": [
"https://avatars.githubusercontent.com/u/10451654?v=4"
]
}
],
"contributorsPerLine": 7
"projectName": "CPP_ROI",
"projectOwner": "cpp-lln-lab",
"repoType": "github",
"repoHost": "https://github.com",
"files": [
"README.md"
],
"imageSize": 100,
"commit": true,
"commitConvention": "none",
"contributors": [
{
"login": "marcobarilari",
"name": "Marco Barilari",
"contributions": [
"code",
"doc",
"ideas"
],
"profile": "https://github.com/marcobarilari",
"avatar_url": [
"https://avatars.githubusercontent.com/u/38101692?v=4"
]
},
{
"login": "Remi-Gau",
"name": "Remi Gau",
"contributions": [
"code",
"doc",
"infra",
"design",
"review",
"bug",
"test"
],
"profile": "https://github.com/Remi-Gau",
"avatar_url": [
"https://avatars.githubusercontent.com/u/6961185?v=4"
]
},
{
"login": "JeanneCaronGuyon ",
"name": "Jeanne Caron-Guyon ",
"avatar_url": "https://avatars.githubusercontent.com/u/8718798?v=4",
"profile": "https://github.com/JeanneCaronGuyon",
"contributions": [
"ideas",
"userTesting"
]
},
{
"login": "iqrashahzad14",
"name": "Iqra Shahzad",
"avatar_url": "https://avatars.githubusercontent.com/u/75671348?v=4",
"profile": "https://github.com/iqrashahzad14",
"contributions": [
"userTesting"
]
},
{
"login": "fedefalag",
"name": "Federica Falagiarda",
"avatar_url": "https://avatars2.githubusercontent.com/u/50373329?v=4",
"profile": "https://github.com/fedefalag",
"contributions": [
"bug",
"userTesting"
]
},
{
"login": "CerenB",
"name": "Ceren Battal",
"contributions": [
"code",
"review",
"userTesting"
],
"profile": "https://github.com/CerenB",
"avatar_url": [
"https://avatars.githubusercontent.com/u/10451654?v=4"
]
},
{
"login": "JacMatu",
"name": "Jacek Matuszewski",
"avatar_url": "https://avatars.githubusercontent.com/u/94451915?v=4",
"profile": "https://github.com/JacMatu",
"contributions": [
"bug",
"userTesting"
]
}
],
"contributorsPerLine": 7,
"commitType": "docs"
}
2 changes: 1 addition & 1 deletion .github/workflows/run_tests_matlab.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
command: cd(fullfile(getenv('GITHUB_WORKSPACE'), '.github', 'workflows')); run tests_matlab;

- name: Code coverage
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
file: coverage.xml
flags: ${{ matrix.os }}_matlab-${{ matrix.version }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/validate_cff.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
fetch-depth: 1

- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.9

Expand Down
19 changes: 11 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,14 +81,17 @@ Also includes:
<!-- prettier-ignore-start -->
<!-- markdownlint-disable -->
<table>
<tr>
<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> <a href="https://github.com/cpp-lln-lab/CPP_ROI/commits?author=marcobarilari" title="Documentation">📖</a> <a href="#ideas-marcobarilari" title="Ideas, Planning, & Feedback">🤔</a></td>
<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> <a href="https://github.com/cpp-lln-lab/CPP_ROI/commits?author=Remi-Gau" title="Documentation">📖</a> <a href="#infra-Remi-Gau" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#design-Remi-Gau" title="Design">🎨</a> <a href="https://github.com/cpp-lln-lab/CPP_ROI/pulls?q=is%3Apr+reviewed-by%3ARemi-Gau" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/cpp-lln-lab/CPP_ROI/issues?q=author%3ARemi-Gau" title="Bug reports">🐛</a> <a href="https://github.com/cpp-lln-lab/CPP_ROI/commits?author=Remi-Gau" title="Tests">⚠️</a></td>
<td align="center"><a href="https://github.com/JeanneCaronGuyon"><img src="https://avatars.githubusercontent.com/u/8718798?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jeanne Caron-Guyon </b></sub></a><br /><a href="#ideas-JeanneCaronGuyon " title="Ideas, Planning, & Feedback">🤔</a> <a href="#userTesting-JeanneCaronGuyon " title="User Testing">📓</a></td>
<td align="center"><a href="https://github.com/iqrashahzad14"><img src="https://avatars.githubusercontent.com/u/75671348?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Iqra Shahzad</b></sub></a><br /><a href="#userTesting-iqrashahzad14" title="User Testing">📓</a></td>
<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>
<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> <a href="https://github.com/cpp-lln-lab/CPP_ROI/pulls?q=is%3Apr+reviewed-by%3ACerenB" title="Reviewed Pull Requests">👀</a> <a href="#userTesting-CerenB" title="User Testing">📓</a></td>
</tr>
<tbody>
<tr>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/marcobarilari"><img src="https://avatars.githubusercontent.com/u/38101692?v=4?s=100" width="100px;" alt="Marco Barilari"/><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> <a href="https://github.com/cpp-lln-lab/CPP_ROI/commits?author=marcobarilari" title="Documentation">📖</a> <a href="#ideas-marcobarilari" title="Ideas, Planning, & Feedback">🤔</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Remi-Gau"><img src="https://avatars.githubusercontent.com/u/6961185?v=4?s=100" width="100px;" alt="Remi Gau"/><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> <a href="https://github.com/cpp-lln-lab/CPP_ROI/commits?author=Remi-Gau" title="Documentation">📖</a> <a href="#infra-Remi-Gau" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#design-Remi-Gau" title="Design">🎨</a> <a href="https://github.com/cpp-lln-lab/CPP_ROI/pulls?q=is%3Apr+reviewed-by%3ARemi-Gau" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/cpp-lln-lab/CPP_ROI/issues?q=author%3ARemi-Gau" title="Bug reports">🐛</a> <a href="https://github.com/cpp-lln-lab/CPP_ROI/commits?author=Remi-Gau" title="Tests">⚠️</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/JeanneCaronGuyon"><img src="https://avatars.githubusercontent.com/u/8718798?v=4?s=100" width="100px;" alt="Jeanne Caron-Guyon "/><br /><sub><b>Jeanne Caron-Guyon </b></sub></a><br /><a href="#ideas-JeanneCaronGuyon " title="Ideas, Planning, & Feedback">🤔</a> <a href="#userTesting-JeanneCaronGuyon " title="User Testing">📓</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/iqrashahzad14"><img src="https://avatars.githubusercontent.com/u/75671348?v=4?s=100" width="100px;" alt="Iqra Shahzad"/><br /><sub><b>Iqra Shahzad</b></sub></a><br /><a href="#userTesting-iqrashahzad14" title="User Testing">📓</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/fedefalag"><img src="https://avatars2.githubusercontent.com/u/50373329?v=4?s=100" width="100px;" alt="Federica Falagiarda"/><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>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/CerenB"><img src="https://avatars.githubusercontent.com/u/10451654?v=4?s=100" width="100px;" alt="Ceren Battal"/><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> <a href="https://github.com/cpp-lln-lab/CPP_ROI/pulls?q=is%3Apr+reviewed-by%3ACerenB" title="Reviewed Pull Requests">👀</a> <a href="#userTesting-CerenB" title="User Testing">📓</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/JacMatu"><img src="https://avatars.githubusercontent.com/u/94451915?v=4?s=100" width="100px;" alt="Jacek Matuszewski"/><br /><sub><b>Jacek Matuszewski</b></sub></a><br /><a href="https://github.com/cpp-lln-lab/CPP_ROI/issues?q=author%3AJacMatu" title="Bug reports">🐛</a> <a href="#userTesting-JacMatu" title="User Testing">📓</a></td>
</tr>
</tbody>
</table>

<!-- markdownlint-restore -->
Expand Down

0 comments on commit 695166b

Please sign in to comment.