Skip to content

Commit 98a78fe

Browse files
authored
Merge pull request #527 from precice/develop
Release v2404.0
2 parents 14197c2 + 0c3a226 commit 98a78fe

File tree

804 files changed

+69592
-3736
lines changed

Some content is hidden

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

804 files changed

+69592
-3736
lines changed

.clang-format

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
1+
---
2+
Language: Cpp
3+
AccessModifierOffset: -2
4+
AlignAfterOpenBracket: Align
5+
AlignConsecutiveAssignments: true
6+
AlignConsecutiveDeclarations: true
7+
AlignEscapedNewlines: Right
8+
AlignOperands: true
9+
AlignTrailingComments: true
10+
AllowAllParametersOfDeclarationOnNextLine: true
11+
AllowShortBlocksOnASingleLine: false
12+
AllowShortCaseLabelsOnASingleLine: false
13+
AllowShortFunctionsOnASingleLine: Empty
14+
AllowShortIfStatementsOnASingleLine: false
15+
AllowShortLoopsOnASingleLine: false
16+
AlwaysBreakAfterDefinitionReturnType: None
17+
AlwaysBreakAfterReturnType: None
18+
AlwaysBreakBeforeMultilineStrings: false
19+
AlwaysBreakTemplateDeclarations: MultiLine
20+
BinPackArguments: true
21+
BinPackParameters: true
22+
BraceWrapping:
23+
AfterClass: false
24+
AfterControlStatement: false
25+
AfterEnum: false
26+
AfterFunction: true
27+
AfterNamespace: false
28+
AfterObjCDeclaration: false
29+
AfterStruct: false
30+
AfterUnion: false
31+
AfterExternBlock: false
32+
BeforeCatch: false
33+
BeforeElse: false
34+
IndentBraces: false
35+
SplitEmptyFunction: true
36+
SplitEmptyRecord: true
37+
SplitEmptyNamespace: true
38+
BreakBeforeBinaryOperators: None
39+
BreakBeforeBraces: Custom
40+
BreakBeforeInheritanceComma: false
41+
BreakInheritanceList: BeforeColon
42+
BreakBeforeTernaryOperators: true
43+
BreakConstructorInitializersBeforeComma: false
44+
BreakConstructorInitializers: BeforeColon
45+
BreakAfterJavaFieldAnnotations: false
46+
BreakStringLiterals: true
47+
ColumnLimit: 0
48+
CommentPragmas: '^ IWYU pragma:'
49+
CompactNamespaces: false
50+
ConstructorInitializerAllOnOneLineOrOnePerLine: false
51+
ConstructorInitializerIndentWidth: 4
52+
ContinuationIndentWidth: 4
53+
Cpp11BracedListStyle: true
54+
DerivePointerAlignment: false
55+
DisableFormat: false
56+
ExperimentalAutoDetectBinPacking: false
57+
FixNamespaceComments: true
58+
ForEachMacros:
59+
- foreach
60+
- Q_FOREACH
61+
- BOOST_FOREACH
62+
IncludeBlocks: Preserve
63+
IncludeCategories:
64+
- Regex: '^(<|"(gtest|isl|json)/)'
65+
Priority: 1
66+
- Regex: '.*'
67+
Priority: 2
68+
- Regex: '.*'
69+
Priority: 1
70+
IncludeIsMainRegex: '$'
71+
IndentCaseLabels: false
72+
IndentPPDirectives: None
73+
IndentWidth: 2
74+
IndentWrappedFunctionNames: false
75+
JavaScriptQuotes: Leave
76+
JavaScriptWrapImports: true
77+
KeepEmptyLinesAtTheStartOfBlocks: true
78+
MacroBlockBegin: ''
79+
MacroBlockEnd: ''
80+
MaxEmptyLinesToKeep: 1
81+
NamespaceIndentation: None
82+
ObjCBinPackProtocolList: Auto
83+
ObjCBlockIndentWidth: 2
84+
ObjCSpaceAfterProperty: false
85+
ObjCSpaceBeforeProtocolList: true
86+
PenaltyBreakAssignment: 2
87+
PenaltyBreakBeforeFirstCallParameter: 19
88+
PenaltyBreakComment: 300
89+
PenaltyBreakFirstLessLess: 120
90+
PenaltyBreakString: 1000
91+
PenaltyBreakTemplateDeclaration: 10
92+
PenaltyExcessCharacter: 1000000
93+
PenaltyReturnTypeOnItsOwnLine: 100
94+
PointerAlignment: Right
95+
ReflowComments: true
96+
SortIncludes: true
97+
SortUsingDeclarations: true
98+
SpaceAfterCStyleCast: true
99+
SpaceAfterTemplateKeyword: true
100+
SpaceBeforeAssignmentOperators: true
101+
SpaceBeforeCpp11BracedList: false
102+
SpaceBeforeCtorInitializerColon: true
103+
SpaceBeforeInheritanceColon: true
104+
SpaceBeforeParens: ControlStatements
105+
SpaceBeforeRangeBasedForLoopColon: true
106+
SpaceInEmptyParentheses: false
107+
SpacesBeforeTrailingComments: 1
108+
SpacesInAngles: false
109+
SpacesInContainerLiterals: true
110+
SpacesInCStyleCastParentheses: false
111+
SpacesInParentheses: false
112+
SpacesInSquareBrackets: false
113+
Standard: Cpp11
114+
StatementMacros:
115+
- Q_UNUSED
116+
- QT_REQUIRE_VERSION
117+
TabWidth: 2
118+
UseTab: Never
119+
...

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.tar.gz filter=lfs diff=lfs merge=lfs -text

.github/pull_request_template.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
11
<!-- Please submit your Pull Request to the `develop` branch.
22
33
It may help to have a look at the file `CONTRIBUTING.md` for a few hints and guidelines. -->
4+
5+
Checklist:
6+
7+
- [ ] I added a summary of any user-facing changes (compared to the last release) in the `changelog-entries/<PRnumber>.md`.
8+
- [ ] I will remember to squash-and-merge, providing a useful summary of the changes of this PR.

.github/workflows/check-markdown.yml

Lines changed: 0 additions & 14 deletions
This file was deleted.

.github/workflows/check-pep8.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

.github/workflows/check-scripts.yaml

Lines changed: 0 additions & 14 deletions
This file was deleted.

.github/workflows/check-style.yml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Check style
2+
on:
3+
push:
4+
branches:
5+
- master
6+
- develop
7+
pull_request:
8+
branches:
9+
- master
10+
- develop
11+
jobs:
12+
check_style:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- name: Checkout the repository
16+
uses: actions/checkout@v4
17+
- name: Setup python
18+
uses: actions/setup-python@v5
19+
with:
20+
python-version: '3.10'
21+
check-latest: true
22+
- name: Install pre-commit
23+
run: pip install pre-commit
24+
- name: Run checks
25+
run: pre-commit run -a -v
26+
- name: Git status
27+
if: always()
28+
run: |
29+
echo -e '### Status\n```text' >> $GITHUB_STEP_SUMMARY
30+
git status | tee -a $GITHUB_STEP_SUMMARY
31+
echo '```' >> $GITHUB_STEP_SUMMARY
32+
- name: Full diff
33+
if: always()
34+
run: |
35+
echo -e '### Diff\n```diff' >> $GITHUB_STEP_SUMMARY
36+
git diff | tee -a $GITHUB_STEP_SUMMARY
37+
echo '```' >> $GITHUB_STEP_SUMMARY
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: Generate reference results (manual)
2+
on:
3+
workflow_dispatch:
4+
inputs:
5+
from_ref:
6+
description: 'Use the systemtests + tutorial metadata + reference_version from this ref'
7+
required: true
8+
type: string
9+
commit_msg:
10+
description: 'Commit msg for commit that adds the reference results'
11+
default: "Adding reference results"
12+
type: string
13+
loglevel:
14+
description: 'loglevel used for the systemtests'
15+
default: 'INFO'
16+
required: true
17+
type: choice
18+
options:
19+
- 'DEBUG'
20+
- 'INFO'
21+
- 'WARNING'
22+
- 'ERROR'
23+
- 'CRITICAL'
24+
25+
jobs:
26+
generate_reference_results_manual:
27+
uses: ./.github/workflows/generate_reference_results_workflow.yml
28+
with:
29+
from_ref: ${{ inputs.from_ref }}
30+
commit_msg: ${{ inputs.commit_msg }}
31+
loglevel: ${{ inputs.loglevel }}
Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
name: Generate reference results workflow
2+
on:
3+
workflow_call:
4+
inputs:
5+
from_ref:
6+
description: 'Use the systemtests + tutorial metadata + reference_version from this ref'
7+
required: true
8+
type: string
9+
commit_msg:
10+
description: 'Commit msg for commit that adds the reference results'
11+
default: "Adding reference results"
12+
type: string
13+
loglevel:
14+
description: 'loglevel used for the systemtests'
15+
default: 'INFO'
16+
required: true
17+
type: string
18+
jobs:
19+
generate_reference_results:
20+
runs-on: [self-hosted, linux, x64, precice-tests-vm]
21+
steps:
22+
- name: Display a quick job summary
23+
run: |
24+
echo "Initiated by: ${{ github.actor }}"
25+
echo "Running generate_reference_results.py --log-level ${{inputs.loglevel}}"
26+
echo "Using Ref: ${{ inputs.from_ref }}"
27+
echo "Commit message on success: ${{ inputs.commit_msg }}"
28+
- name: Move LFS URL to local LFS server
29+
run: |
30+
/home/precice/runners_root/scripts/make_lfs_local.sh
31+
- name: 'Cleanup the folder'
32+
# The first rf -rf ./* removes all non hidden files
33+
# The second rf -rf ./.??* removes all hidden files (but not . and ..)
34+
run: |
35+
ls -la ./
36+
rm -rf ./*
37+
rm -rf ./.??*
38+
ls -la ./
39+
- name: Check out Tutorials for systest
40+
uses: actions/checkout@v4
41+
with:
42+
ref: ${{ inputs.from_ref }}
43+
lfs: true
44+
fetch-depth: 0
45+
- name: Install Python dependencies
46+
run: |
47+
pip install --user -r tools/tests/requirements.txt
48+
- name: Run tests
49+
run: |
50+
cd tools/tests
51+
test -f generate_reference_results.py && export GENERATE_REF_RESULTS=generate_reference_results.py
52+
test -f generate_reference_data.py && export GENERATE_REF_RESULTS=generate_reference_data.py
53+
echo "Selected $GENERATE_REF_RESULTS to run"
54+
python $GENERATE_REF_RESULTS --log-level=${{inputs.loglevel}}
55+
cd ../../
56+
- name: Create commit
57+
if: success()
58+
run: |
59+
git checkout ${{ inputs.from_ref }}
60+
git add ./*/*/*.tar.gz
61+
git add ./*/*.tar.gz
62+
git add ./*/*.metadata
63+
git commit -m "${{inputs.commit_msg}}"
64+
git push
65+
- name: Upload artifacts for debugging
66+
if: failure()
67+
uses: actions/upload-artifact@v3
68+
with:
69+
name: runs
70+
path: |
71+
runs/*
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
name: Run Testsuite (manual) # Unfortunately, we cannot modify the name: https://github.community/t/github-actions-dynamic-name-of-the-workflow-with-workflow-dispatch/150327
2+
on:
3+
workflow_dispatch:
4+
inputs:
5+
suites:
6+
description: 'Comma seperated testsuites to execute'
7+
required: true
8+
type: string
9+
build_args:
10+
description: 'Build arguments, if not specified defaults will be taken'
11+
required: false
12+
type: string
13+
systests_branch:
14+
description: 'Branch to take the systest from'
15+
default: 'develop'
16+
required: true
17+
type: string
18+
loglevel:
19+
description: 'loglevel used for the systemtests'
20+
default: 'INFO'
21+
required: true
22+
type: choice
23+
options:
24+
- 'DEBUG'
25+
- 'INFO'
26+
- 'WARNING'
27+
- 'ERROR'
28+
- 'CRITICAL'
29+
upload_artifacts:
30+
description: 'Upload artifacts also on success (not only on failure)'
31+
default: 'FALSE'
32+
type: choice
33+
options:
34+
- 'FALSE'
35+
- 'TRUE'
36+
37+
jobs:
38+
run_testsuite_manual:
39+
uses: ./.github/workflows/run_testsuite_workflow.yml
40+
with:
41+
suites: ${{ inputs.suites }}
42+
build_args: ${{ inputs.build_args }}
43+
systests_branch: ${{ inputs.systests_branch }}
44+
loglevel: ${{ inputs.loglevel }}
45+
upload_artifacts: ${{ inputs.upload_artifacts }}

0 commit comments

Comments
 (0)