Skip to content
Snippets Groups Projects
Commit badc53c9 authored by Lars Bilke's avatar Lars Bilke Committed by Dmitri Naumov
Browse files

[ci] Removed OGS_USE_PYTHON.

parent b72e93f3
No related branches found
No related tags found
Loading
......@@ -16,10 +16,6 @@ build gui win:
variables:
CMAKE_PRESET: release-gui
CMAKE_ARGS: >-
-DOGS_$USE_PYTHON
-DOGS_CI_TESTRUNNER_REPEAT=1
-DOGS_BUILD_PROCESSES=SteadyStateDiffusion
$ADDITIONAL_CMAKE_ARGS
parallel:
matrix:
- USE_PYTHON: ["USE_PYTHON=ON", "USE_PYTHON=OFF"]
......@@ -5,20 +5,9 @@ build linux:
- .test-artifacts
tags: [docker]
needs: [meta, ci_images]
rules:
- if: "$USE_PYTHON =~ /ON$/"
- if: '$CI_COMMIT_BRANCH == "master"'
- if: $CI_COMMIT_BRANCH =~ /^v[0-9]\.[0-9]\.[0-9]/
- when: manual
allow_failure: true
timeout: 3h
variables:
CMAKE_PRESET: release-all
CMAKE_ARGS: >-
-DOGS_$USE_PYTHON
parallel:
matrix:
- USE_PYTHON: ["USE_PYTHON=ON", "USE_PYTHON=OFF"]
linux ctest large:
image: $CONTAINER_GCC_IMAGE
......@@ -35,8 +24,6 @@ linux ctest large:
BUILD_TESTS: "false"
BUILD_CTEST_LARGE: "true"
CMAKE_PRESET: release-all
CMAKE_ARGS: >-
-DOGS_USE_PYTHON=ON
build linux (no unity):
image: $CONTAINER_GCC_IMAGE
......
......@@ -7,6 +7,7 @@ workflow:
- if: $CI_COMMIT_TAG
variables:
PYPI_REPO: --repository pypi
# TODO: does not work:
PYPI_AUTH: --username __token__ --password "${PYPI_TOKEN}"
GIT_DEPTH: 1000
- if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH
......
......@@ -2,25 +2,15 @@ build win:
extends:
- .template-build-win
- .vs2019-environment
rules:
- if: "$USE_PYTHON =~ /ON$/"
- if: '$CI_COMMIT_BRANCH == "master"'
- if: $CI_COMMIT_BRANCH =~ /^v[0-9]\.[0-9]\.[0-9]/
- when: manual
allow_failure: true
variables:
CHECK_WARNINGS: "true"
CMAKE_PRESET: release
# TODO: temporary switched off TH2M
CMAKE_ARGS: >-
-DOGS_CI_TESTRUNNER_REPEAT=1
-DOGS_$USE_PYTHON
-DOGS_BUILD_PROCESS_TH2M=OFF
-DOGS_USE_PIP=ON
-DOGS_USE_MKL=ON
parallel:
matrix:
- USE_PYTHON: ["USE_PYTHON=ON", "USE_PYTHON=OFF"]
build win msvc:
extends:
......
cppcheck:
stage: check
needs: [ meta ]
tags: [ envinf ]
needs: [meta]
tags: [envinf]
before_script:
- mkdir -p build
- cd build
script:
- >
cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release -DOGS_USE_CONAN=OFF
-DOGS_USE_PYTHON=OFF -DOGS_BUILD_UTILS=OFF
-DOGS_BUILD_UTILS=OFF
-DOGS_USE_UNITY_BUILDS=OFF -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
- bash cppcheck.sh
artifacts:
......
......@@ -98,8 +98,8 @@ offline configure:
- tar xf ext.tar.gz
- |
cmake ../../ogs -B . -G Ninja --preset release \
-DOGS_USE_PYTHON=OFF -DOGS_DOWNLOAD_CPM_CACHE=ON
-DOGS_DOWNLOAD_CPM_CACHE=ON
rm CMakeCache.txt
cmake ../../ogs -B . -G Ninja --preset release-petsc \
-DOGS_USE_PYTHON=OFF -DOGS_DOWNLOAD_CPM_CACHE=ON \
-DOGS_DOWNLOAD_CPM_CACHE=ON \
-DOGS_USE_MFRONT=ON -DOGS_USE_LIS=ON -DOGS_EXTERNAL_DEPENDENCIES_CACHE=./ext
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment