diff --git a/scripts/ci/jobs/build-win.yml b/scripts/ci/jobs/build-win.yml index 93d8c4d0a391487d7ca5a154365fef5275ae76db..275634b8451f91b2a3ebd4724748d46a9ca11cd2 100644 --- a/scripts/ci/jobs/build-win.yml +++ b/scripts/ci/jobs/build-win.yml @@ -1,21 +1,17 @@ build win: extends: .template-build-win + rules: + - if: '$USE_PYTHON =~ /ON$/' + - if: '$CI_COMMIT_BRANCH == "master"' + - when: manual + allow_failure: true variables: BUILD_DIR: build-win CMAKE_ARGS: >- -DOGS_BUILD_UTILS=ON -DOGS_CI_TESTRUNNER_REPEAT=1 - -DOGS_USE_PYTHON=ON + -DOGS_$USE_PYTHON -DOGS_USE_CONAN=AUTO - -build win no python: - extends: .template-build-win - rules: - - if: '$CI_COMMIT_BRANCH == "master"' - - when: manual - allow_failure: true - variables: - BUILD_DIR: build-win-nopython - BUILD_TESTS: "false" - BUILD_CTEST: "false" - CMAKE_ARGS: " " + parallel: + matrix: + - USE_PYTHON: ["USE_PYTHON=ON", "USE_PYTHON=OFF"] diff --git a/scripts/ci/jobs/checks.yml b/scripts/ci/jobs/checks.yml index cabfc9bf46f3ba1c6f200eb81236a215feb33a79..fe3fb6423437b1d6206df915cdeedf5ca888f715 100644 --- a/scripts/ci/jobs/checks.yml +++ b/scripts/ci/jobs/checks.yml @@ -5,7 +5,7 @@ compiler warnings: allow_failure: true needs: - job: build linux - - job: build win + - job: "build win: [USE_PYTHON=ON]" - job: build mac script: - exit_code=0 diff --git a/web/content/releases/_index.md b/web/content/releases/_index.md index d5b20d61f7f8a06ae6cc0c6e6e723507ea7d1de0..1420ba61fb4deced2c8aea94b7f6e3972eee085b 100644 --- a/web/content/releases/_index.md +++ b/web/content/releases/_index.md @@ -21,13 +21,13 @@ icon = "fab fa-windows" [[head_downloads]] name = "Latest Windows CLI with Utilities (without Python bindings)" -url = "https://gitlab.opengeosys.org/ogs/ogs/-/jobs/artifacts/master/browse/build-win-nopython?job=build+win+no+python" +url = "https://gitlab.opengeosys.org/ogs/ogs/-/jobs/artifacts/master/browse/build-win?job=build+win+no+python" note = "Download and unpack .zip-file" icon = "fab fa-windows" [[head_downloads]] name = "Latest Windows Data Explorer with Utilities (without Python bindings)" -url = "https://gitlab.opengeosys.org/ogs/ogs/-/jobs/artifacts/master/browse/build-gui-win-nopython?job=build+gui+win+no+python" +url = "https://gitlab.opengeosys.org/ogs/ogs/-/jobs/artifacts/master/browse/build-gui-win?job=build+gui+win+no+python" note = "Download and unpack .zip-file" icon = "fab fa-windows"