Skip to content

Commit

Permalink
Merge branch 'simplify-ci-linux' into 'master'
Browse files Browse the repository at this point in the history
[ci] Remove linux docker jobs

See merge request ogs/ogs!4945
  • Loading branch information
bilke committed Mar 12, 2024
2 parents 48c0bdb + 2c96b6a commit decf8d9
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 29 deletions.
6 changes: 2 additions & 4 deletions scripts/ci/jobs/build-docs.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
build docs:
stage: build
image: $CONTAINER_GCC_IMAGE
needs: [meta, ci_images]
needs: [meta]
tags: [shell, envinf23]
timeout: 30 minutes
variables:
DOX_WARNINGS_THRESHOLD: 18
# Applying PATCH_COMMAND in Docker volume does not work, therefore using local cache:
CPM_SOURCE_CACHE: $CI_PROJECT_DIR/build/_deps
script:
- mkdir -p build
# cpp-dependencies
Expand Down
29 changes: 11 additions & 18 deletions scripts/ci/jobs/build-linux.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,9 @@
build linux:
image: $CONTAINER_GCC_IMAGE
extends:
- .template-build-linux
- .test-artifacts
tags: [docker]
needs: [meta, ci_images]
timeout: 3h
variables:
CMAKE_PRESET: release-all

linux ctest large:
image: $CONTAINER_GCC_IMAGE
extends:
- .template-build-linux
- .test-artifacts
tags: [docker, envinf2]
needs: [meta, ci_images]
tags: [shell, envinf23]
needs: [meta]
rules:
- when: manual
allow_failure: true
Expand All @@ -24,12 +12,18 @@ linux ctest large:
BUILD_TESTS: "false"
BUILD_CTEST_LARGE: "true"
CMAKE_PRESET: release-all
CMAKE_ARGS: >-
-DBUILD_SHARED_LIBS=ON
-DOGS_USE_MKL=ON
-DOGS_USE_NETCDF=ON
before_script:
- source /opt/intel/oneapi/setvars.sh

build linux (no unity):
extends:
- .template-build-linux
tags: [shell, envinf]
needs: [meta, ci_images]
needs: [meta]
timeout: 3h
variables:
BUILD_TESTS: "false"
Expand All @@ -38,10 +32,9 @@ build linux (no unity):
CMAKE_PRESET: ci-no-unity

build linux (no deps, no procs):
image: $CONTAINER_GCC_IMAGE
extends: .template-build-linux
tags: [docker]
needs: [meta, ci_images]
tags: [shell, envinf]
needs: [meta]
timeout: 2h
variables:
BUILD_TESTS: "false"
Expand Down
7 changes: 0 additions & 7 deletions scripts/ci/jobs/ci_images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ ci_images:
dotenv: build.env
script:
- |
echo "CONTAINER_GCC_IMAGE=${CONTAINER_REGISTRY}/gcc:${CONTAINER_TAG}" >> build.env
echo "CONTAINER_GCC_GUI_IMAGE=${CONTAINER_REGISTRY}/gcc-gui:${CONTAINER_TAG}" >> build.env
echo "CONTAINER_GCC_PM_OFF_IMAGE=${CONTAINER_REGISTRY}/gcc-pm-off:${CONTAINER_TAG}" >> build.env
echo "CONTAINER_CLANG_IMAGE=${CONTAINER_REGISTRY}/clang:${CONTAINER_TAG}" >> build.env
Expand All @@ -42,12 +41,6 @@ ci_images:
- source build.env
- !reference [.container-maker-setup, before_script]
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- poetry run ogscm compiler.py ogs.py --build --ogs off
--pm system --cvode --cppcheck --docs --gcovr --mfront --ccache
--version_file ../../web/data/versions.json
--tag $CONTAINER_GCC_IMAGE --upload
--cpu-target $CPU_TARGET
--packages build-essential
- poetry run ogscm compiler.py ogs.py --build --ogs off
--cvode --cppcheck --docs --gcovr --gui --ccache
--version_file ../../web/data/versions.json
Expand Down
1 change: 1 addition & 0 deletions scripts/ci/pipelines/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ include:
- local: "/scripts/ci/jobs/build-guix.yml"
- local: "/scripts/ci/jobs/jupyter.yml"
- local: "/scripts/ci/jobs/code-quality.yml"
- local: "/scripts/ci/jobs/build-docs.yml"

0 comments on commit decf8d9

Please sign in to comment.