Skip to content
Snippets Groups Projects
Commit d0bd2a8f authored by Tiago de Freitas Pereira's avatar Tiago de Freitas Pereira
Browse files

Revert "Merge branch 'happily-remove-mac-from-ci-builds' into 'master'"

This reverts merge request !214
parent f4e5f7da
No related branches found
No related tags found
1 merge request!215Revert "Merge branch 'happily-remove-mac-from-ci-builds' into 'master'"
Pipeline #49309 passed
...@@ -48,6 +48,24 @@ build_linux: ...@@ -48,6 +48,24 @@ build_linux:
key: "linux-cache" key: "linux-cache"
build_macos_intel:
extends: .build_template
tags:
- macos
- intel
script:
- python3 ./bob/devtools/bootstrap.py -vv build
- source ${CONDA_ROOT}/etc/profile.d/conda.sh
- conda activate base
- python3 ./bob/devtools/build.py -vv
artifacts:
paths:
- ${CONDA_ROOT}/conda-bld/osx-64/*.conda
- ${CONDA_ROOT}/conda-bld/osx-64/*.tar.bz2
cache:
key: "macos-intel-cache"
# Deploy targets # Deploy targets
.deploy_template: .deploy_template:
stage: deploy stage: deploy
...@@ -63,6 +81,7 @@ build_linux: ...@@ -63,6 +81,7 @@ build_linux:
- bdt ci clean -vv - bdt ci clean -vv
dependencies: dependencies:
- build_linux - build_linux
- build_macos_intel
tags: tags:
- docker - docker
cache: cache:
...@@ -104,6 +123,7 @@ pypi: ...@@ -104,6 +123,7 @@ pypi:
- bdt ci clean -vv - bdt ci clean -vv
dependencies: dependencies:
- build_linux - build_linux
- build_macos_intel
tags: tags:
- docker - docker
cache: cache:
......
...@@ -38,3 +38,12 @@ build_linux: ...@@ -38,3 +38,12 @@ build_linux:
image: docker.idiap.ch/bob/docker-images/c3i-linux-64 image: docker.idiap.ch/bob/docker-images/c3i-linux-64
cache: cache:
key: "linux-cache" key: "linux-cache"
build_macos_intel:
extends: .build_template
tags:
- macos
- intel
cache:
key: "macos-intel-cache"
...@@ -57,6 +57,26 @@ build_linux_38: ...@@ -57,6 +57,26 @@ build_linux_38:
cache: cache:
key: 'build-py38' key: 'build-py38'
build_macos_intel_37:
extends: .build_template
variables:
PYTHON_VERSION: "3.7"
tags:
- macos
- intel
cache:
key: 'build-py37'
build_macos_intel_38:
extends: .build_template
variables:
PYTHON_VERSION: "3.8"
tags:
- macos
- intel
cache:
key: 'build-py38'
# Periodic cleanup of beta packages # Periodic cleanup of beta packages
.cleanup_template: .cleanup_template:
......
...@@ -67,6 +67,17 @@ build_linux: ...@@ -67,6 +67,17 @@ build_linux:
- ${CONDA_ROOT}/conda-bld/noarch/*.tar.bz2 - ${CONDA_ROOT}/conda-bld/noarch/*.tar.bz2
build_macos_intel:
variables:
PYTHON_VERSION: "3.8"
cache:
key: "build"
extends: .build_template
tags:
- macos
- intel
# Test targets (not normally used) # Test targets (not normally used)
.test_template: .test_template:
extends: .bootstrap extends: .bootstrap
...@@ -86,6 +97,13 @@ build_linux: ...@@ -86,6 +97,13 @@ build_linux:
image: docker.idiap.ch/bob/docker-images/c3i-linux-64 image: docker.idiap.ch/bob/docker-images/c3i-linux-64
.test_macos_intel_template:
extends: .test_template
tags:
- macos
- intel
# Deploy targets # Deploy targets
.deploy_template: .deploy_template:
extends: .bootstrap extends: .bootstrap
...@@ -95,6 +113,7 @@ build_linux: ...@@ -95,6 +113,7 @@ build_linux:
- bdt ci clean -vv - bdt ci clean -vv
dependencies: dependencies:
- build_linux - build_linux
- build_macos_intel
tags: tags:
- docker - docker
cache: cache:
...@@ -133,6 +152,7 @@ pypi: ...@@ -133,6 +152,7 @@ pypi:
- bdt ci clean -vv - bdt ci clean -vv
dependencies: dependencies:
- build_linux - build_linux
- build_macos_intel
tags: tags:
- docker - docker
cache: cache:
......
...@@ -57,6 +57,31 @@ stages: ...@@ -57,6 +57,31 @@ stages:
- ${CONDA_ROOT}/conda-bld/linux-64/*.tar.bz2 - ${CONDA_ROOT}/conda-bld/linux-64/*.tar.bz2
.build_macos_intel_template:
extends: .build_template
tags:
- macos
- intel
artifacts:
paths:
- ${CONDA_ROOT}/conda-bld/osx-64/*.conda
- ${CONDA_ROOT}/conda-bld/osx-64/*.tar.bz2
build_macos_intel_37:
extends: .build_macos_intel_template
variables:
PYTHON_VERSION: "3.7"
cache:
key: "build-py37"
build_macos_intel_38:
extends: .build_macos_intel_template
variables:
PYTHON_VERSION: "3.8"
cache:
key: "build-py38"
build_linux_37: build_linux_37:
extends: .build_linux_template extends: .build_linux_template
variables: variables:
...@@ -103,6 +128,13 @@ build_linux_38: ...@@ -103,6 +128,13 @@ build_linux_38:
image: docker.idiap.ch/bob/docker-images/c3i-linux-64 image: docker.idiap.ch/bob/docker-images/c3i-linux-64
.test_macos_intel_template:
extends: .test_template
tags:
- macos
- intel
# Deploy targets # Deploy targets
.deploy_template: .deploy_template:
extends: .bootstrap extends: .bootstrap
...@@ -113,6 +145,8 @@ build_linux_38: ...@@ -113,6 +145,8 @@ build_linux_38:
dependencies: dependencies:
- build_linux_37 - build_linux_37
- build_linux_38 - build_linux_38
- build_macos_intel_37
- build_macos_intel_38
tags: tags:
- docker - docker
cache: cache:
...@@ -152,6 +186,8 @@ pypi: ...@@ -152,6 +186,8 @@ pypi:
dependencies: dependencies:
- build_linux_37 - build_linux_37
- build_linux_38 - build_linux_38
- build_macos_intel_37
- build_macos_intel_38
tags: tags:
- docker - docker
cache: cache:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment