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

[ci] Removed obsolete Linux Conan job.

parent c5ec9292
No related branches found
No related tags found
No related merge requests found
...@@ -33,7 +33,6 @@ include: ...@@ -33,7 +33,6 @@ include:
- local: '/scripts/ci/jobs/build-linux.yml' - local: '/scripts/ci/jobs/build-linux.yml'
- local: '/scripts/ci/jobs/build-linux-petsc.yml' - local: '/scripts/ci/jobs/build-linux-petsc.yml'
- local: '/scripts/ci/jobs/build-linux-frontend.yml' - local: '/scripts/ci/jobs/build-linux-frontend.yml'
- local: '/scripts/ci/jobs/build-linux-conan.yml'
- local: '/scripts/ci/jobs/build-docs.yml' - local: '/scripts/ci/jobs/build-docs.yml'
- local: '/scripts/ci/jobs/build-win.yml' - local: '/scripts/ci/jobs/build-win.yml'
- local: '/scripts/ci/jobs/build-mac.yml' - local: '/scripts/ci/jobs/build-mac.yml'
......
build linux conan:
extends:
- .template-build-linux
- .test-artifacts
- .rules-master-manual
tags: [shell, envinf1-shell]
needs: [meta]
variables:
CMAKE_PRESET: release
CMAKE_ARGS: >-
-DBUILD_SHARED_LIBS=ON
-DOGS_USE_CONAN=AUTO
-DOGS_USE_MFRONT=ON
-DOGS_USE_XDMF=ON
build linux native:
extends:
- .template-build-linux
- .test-artifacts
tags: [shell, envinf]
needs: [meta]
variables:
CMAKE_PRESET: release
CMAKE_ARGS: >-
-DBUILD_SHARED_LIBS=ON
-DOGS_USE_CONAN=OFF
-DOGS_USE_POETRY=OFF
-DOGS_USE_MFRONT=ON
-DOGS_USE_XDMF=ON
...@@ -3,7 +3,7 @@ build linux: ...@@ -3,7 +3,7 @@ build linux:
extends: extends:
- .template-build-linux - .template-build-linux
- .test-artifacts - .test-artifacts
tags: [ docker ] tags: [docker]
needs: [meta, ci_images] needs: [meta, ci_images]
timeout: 2h timeout: 2h
variables: variables:
...@@ -23,7 +23,7 @@ linux ctest large: ...@@ -23,7 +23,7 @@ linux ctest large:
image: $CONTAINER_GCC_IMAGE image: $CONTAINER_GCC_IMAGE
extends: extends:
- .template-build-linux - .template-build-linux
tags: [ docker, envinf2 ] tags: [docker, envinf2]
needs: [meta, ci_images] needs: [meta, ci_images]
rules: rules:
- when: manual - when: manual
...@@ -43,7 +43,7 @@ build linux (no unity): ...@@ -43,7 +43,7 @@ build linux (no unity):
extends: extends:
- .template-build-linux - .template-build-linux
- .test-artifacts - .test-artifacts
tags: [ docker ] tags: [docker]
needs: [meta, ci_images] needs: [meta, ci_images]
timeout: 1h timeout: 1h
variables: variables:
...@@ -62,11 +62,26 @@ build linux (no unity): ...@@ -62,11 +62,26 @@ build linux (no unity):
build linux (no deps, no procs): build linux (no deps, no procs):
image: $CONTAINER_GCC_IMAGE image: $CONTAINER_GCC_IMAGE
extends: .template-build-linux extends: .template-build-linux
tags: [ docker ] tags: [docker]
needs: [ meta, ci_images ] needs: [meta, ci_images]
timeout: 1h timeout: 1h
variables: variables:
BUILD_TESTS: "false" BUILD_TESTS: "false"
BUILD_CTEST: "false" BUILD_CTEST: "false"
BUILD_PROCESSES: "SteadyStateDiffusion" BUILD_PROCESSES: "SteadyStateDiffusion"
CMAKE_PRESET: ci-simplest CMAKE_PRESET: ci-simplest
build linux native:
extends:
- .template-build-linux
- .test-artifacts
tags: [shell, envinf]
needs: [meta]
variables:
CMAKE_PRESET: release
CMAKE_ARGS: >-
-DBUILD_SHARED_LIBS=ON
-DOGS_USE_CONAN=OFF
-DOGS_USE_POETRY=OFF
-DOGS_USE_MFRONT=ON
-DOGS_USE_XDMF=ON
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