From badc53c944c7ced3e83e7e51116c9641eb6502d8 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Mon, 13 Mar 2023 16:05:09 +0100
Subject: [PATCH] [ci] Removed OGS_USE_PYTHON.
---
scripts/ci/jobs/build-gui-win.yml | 4 ----
scripts/ci/jobs/build-linux.yml | 13 -------------
scripts/ci/jobs/build-wheels.yml | 1 +
scripts/ci/jobs/build-win.yml | 10 ----------
scripts/ci/jobs/code-quality.yml | 6 +++---
scripts/ci/jobs/package.yml | 4 ++--
6 files changed, 6 insertions(+), 32 deletions(-)
diff --git a/scripts/ci/jobs/build-gui-win.yml b/scripts/ci/jobs/build-gui-win.yml
index 5d756bb53f2..84ea090a82c 100644
--- a/scripts/ci/jobs/build-gui-win.yml
+++ b/scripts/ci/jobs/build-gui-win.yml
@@ -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"]
diff --git a/scripts/ci/jobs/build-linux.yml b/scripts/ci/jobs/build-linux.yml
index 1d22fb723f9..f9655e4823a 100644
--- a/scripts/ci/jobs/build-linux.yml
+++ b/scripts/ci/jobs/build-linux.yml
@@ -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
diff --git a/scripts/ci/jobs/build-wheels.yml b/scripts/ci/jobs/build-wheels.yml
index 2425477dbd2..9c036ca5fd2 100644
--- a/scripts/ci/jobs/build-wheels.yml
+++ b/scripts/ci/jobs/build-wheels.yml
@@ -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
diff --git a/scripts/ci/jobs/build-win.yml b/scripts/ci/jobs/build-win.yml
index 055323f26bc..85fb64c453a 100644
--- a/scripts/ci/jobs/build-win.yml
+++ b/scripts/ci/jobs/build-win.yml
@@ -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:
diff --git a/scripts/ci/jobs/code-quality.yml b/scripts/ci/jobs/code-quality.yml
index 5e2b1168a0b..0e57b57116f 100644
--- a/scripts/ci/jobs/code-quality.yml
+++ b/scripts/ci/jobs/code-quality.yml
@@ -1,14 +1,14 @@
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:
diff --git a/scripts/ci/jobs/package.yml b/scripts/ci/jobs/package.yml
index bc715e4d5bc..586fad8e534 100644
--- a/scripts/ci/jobs/package.yml
+++ b/scripts/ci/jobs/package.yml
@@ -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
--
GitLab