Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

O

ogs
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

fcef847b

Commit fcef847b authored 4 months ago by Lars Bilke

Downloads
- Plain Diff

Merge branch 'enable-win' into 'master'

[ci] Re-enable win

See merge request ogs/ogs!5143

parents f924b753 e9509b59

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

CMakePresets.json 1 addition, 1 deletion

CMakePresets.json
GeoLib/SensorData.cpp 1 addition, 0 deletions

GeoLib/SensorData.cpp
MathLib/Curve/CreatePiecewiseLinearCurve.h 1 addition, 0 deletions

MathLib/Curve/CreatePiecewiseLinearCurve.h
Tests/ParameterLib/Parameter.cpp 9 additions, 2 deletions

Tests/ParameterLib/Parameter.cpp
pyproject.toml 2 additions, 2 deletions

pyproject.toml
scripts/ci/extends/vs2019-environment.yml 6 additions, 6 deletions

scripts/ci/extends/vs2019-environment.yml
scripts/ci/extends/vs2022-environment.yml 0 additions, 13 deletions

scripts/ci/extends/vs2022-environment.yml
scripts/ci/jobs/build-gui-win.yml 1 addition, 1 deletion

scripts/ci/jobs/build-gui-win.yml
scripts/ci/jobs/build-wheels.yml 4 additions, 4 deletions

scripts/ci/jobs/build-wheels.yml
scripts/ci/jobs/build-win.yml 5 additions, 4 deletions

scripts/ci/jobs/build-win.yml
scripts/ci/pipelines/regular.yml 1 addition, 1 deletion

scripts/ci/pipelines/regular.yml
scripts/cmake/Find.cmake 4 additions, 0 deletions

scripts/cmake/Find.cmake

with 35 additions and 34 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment