Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Jenkins] Ignore some warnings in Docs job. #1585

Merged
merged 5 commits into from
Nov 29, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ class DiagramPrefsDialog : public QDialog, private Ui_DiagramPrefs
* Opens a new dialog and automatically reads data from the specified file. The diagram is not associated
* with any geometric object.
* \param filename File containing data for the diagram(s) to be visualised.
* \param[out] window Returns the created DetailWindow.
* \param parent The parent QDialog.
*/
DiagramPrefsDialog(const QString &filename,
Expand Down
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@
### Utilities
### Infrastructure:

- ctest now works on Windows too by removing time-wrappers
- ctest now works on Windows too by removing time-wrappers. #1480
- Moved to public Jenkins instance at jenkins.opengeosys.org. #1505
- Doxygen warnings parser in Jenkins will mark a build as unstable
if there are Doxygen warnings, #1585

### Fixes:

Expand Down
2 changes: 1 addition & 1 deletion MaterialLib/FractureModels/MohrCoulomb.h
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ class MohrCoulomb final : public FractureModelBase<DisplacementDim>
* @param w fracture displacement at current time step
* @param sigma_prev stress at previous time step
* @param sigma stress at current time step
* @param C tangent matrix for stress and fracture displacements
* @param Kep tangent matrix for stress and fracture displacements
* @param material_state_variables material state variables
*/
void computeConstitutiveRelation(
Expand Down
4 changes: 2 additions & 2 deletions MaterialLib/SolidModels/Ehlers-impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,8 @@ void calculatePlasticResidual(
yieldFunction<DisplacementDim>(s, _mp, t, x) / G;
}

/// Special product of v with itself: v \odot v
/// v is given in Kelvin mapping.
/// Special product of \p v with itself: \f$v \odot v\f$.
/// v is given in \p Kelvin mapping.
template <int DisplacementDim>
ProcessLib::KelvinMatrixType<DisplacementDim> s_odot_s(
ProcessLib::KelvinVectorType<DisplacementDim> const& v)
Expand Down
5 changes: 4 additions & 1 deletion scripts/jenkins/docs.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ def build = new ogs.build()
def post = new ogs.post()
def helper = new ogs.helper()

def image = docker.image('ogs6/gcc-base:latest')
def image = docker.image('ogs6/gcc-latex:latest')
image.pull()
image.inside() {
stage('Configure (Docs)') {
Expand All @@ -25,6 +25,9 @@ stage('Reports (Docs)') {
keepAll: false, reportDir: 'build/docs', reportFiles: 'index.html',
reportName: 'Doxygen'])
step([$class: 'WarningsPublisher', canResolveRelativePaths: false,
messagesPattern:
'.*ogs_file_.*,' +
'.*potential recursive class relation.*',
parserConfigurations: [[parserName: 'Doxygen', pattern:
'build/DoxygenWarnings.log']], unstableNewAll: '0'])
}
Expand Down