From 268a04300f9392f96e4ed353bed4280cf22cbe0a Mon Sep 17 00:00:00 2001
From: Amir MOHAMMADI <amir.mohammadi@idiap.ch>
Date: Mon, 29 Mar 2021 18:14:12 +0200
Subject: [PATCH] Remove mac builds from our CI builds \m/
---
.gitlab-ci.yml | 20 -----------
bob/devtools/data/gitlab-ci/base-build.yaml | 9 -----
bob/devtools/data/gitlab-ci/nightlies.yaml | 20 -----------
bob/devtools/data/gitlab-ci/noarch.yaml | 20 -----------
.../data/gitlab-ci/single-package.yaml | 36 -------------------
5 files changed, 105 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b0147122..feb7859f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -48,24 +48,6 @@ build_linux:
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_template:
stage: deploy
@@ -81,7 +63,6 @@ build_macos_intel:
- bdt ci clean -vv
dependencies:
- build_linux
- - build_macos_intel
tags:
- docker
cache:
@@ -123,7 +104,6 @@ pypi:
- bdt ci clean -vv
dependencies:
- build_linux
- - build_macos_intel
tags:
- docker
cache:
diff --git a/bob/devtools/data/gitlab-ci/base-build.yaml b/bob/devtools/data/gitlab-ci/base-build.yaml
index 5da2248c..31612f78 100644
--- a/bob/devtools/data/gitlab-ci/base-build.yaml
+++ b/bob/devtools/data/gitlab-ci/base-build.yaml
@@ -38,12 +38,3 @@ build_linux:
image: docker.idiap.ch/bob/docker-images/c3i-linux-64
cache:
key: "linux-cache"
-
-
-build_macos_intel:
- extends: .build_template
- tags:
- - macos
- - intel
- cache:
- key: "macos-intel-cache"
diff --git a/bob/devtools/data/gitlab-ci/nightlies.yaml b/bob/devtools/data/gitlab-ci/nightlies.yaml
index 2b2ab48a..5faac583 100644
--- a/bob/devtools/data/gitlab-ci/nightlies.yaml
+++ b/bob/devtools/data/gitlab-ci/nightlies.yaml
@@ -57,26 +57,6 @@ build_linux_38:
cache:
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
.cleanup_template:
diff --git a/bob/devtools/data/gitlab-ci/noarch.yaml b/bob/devtools/data/gitlab-ci/noarch.yaml
index e34164dc..a883a042 100644
--- a/bob/devtools/data/gitlab-ci/noarch.yaml
+++ b/bob/devtools/data/gitlab-ci/noarch.yaml
@@ -67,17 +67,6 @@ build_linux:
- ${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_template:
extends: .bootstrap
@@ -97,13 +86,6 @@ build_macos_intel:
image: docker.idiap.ch/bob/docker-images/c3i-linux-64
-.test_macos_intel_template:
- extends: .test_template
- tags:
- - macos
- - intel
-
-
# Deploy targets
.deploy_template:
extends: .bootstrap
@@ -113,7 +95,6 @@ build_macos_intel:
- bdt ci clean -vv
dependencies:
- build_linux
- - build_macos_intel
tags:
- docker
cache:
@@ -152,7 +133,6 @@ pypi:
- bdt ci clean -vv
dependencies:
- build_linux
- - build_macos_intel
tags:
- docker
cache:
diff --git a/bob/devtools/data/gitlab-ci/single-package.yaml b/bob/devtools/data/gitlab-ci/single-package.yaml
index 0f14aabe..0f31d385 100644
--- a/bob/devtools/data/gitlab-ci/single-package.yaml
+++ b/bob/devtools/data/gitlab-ci/single-package.yaml
@@ -57,31 +57,6 @@ stages:
- ${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:
extends: .build_linux_template
variables:
@@ -128,13 +103,6 @@ build_linux_38:
image: docker.idiap.ch/bob/docker-images/c3i-linux-64
-.test_macos_intel_template:
- extends: .test_template
- tags:
- - macos
- - intel
-
-
# Deploy targets
.deploy_template:
extends: .bootstrap
@@ -145,8 +113,6 @@ build_linux_38:
dependencies:
- build_linux_37
- build_linux_38
- - build_macos_intel_37
- - build_macos_intel_38
tags:
- docker
cache:
@@ -186,8 +152,6 @@ pypi:
dependencies:
- build_linux_37
- build_linux_38
- - build_macos_intel_37
- - build_macos_intel_38
tags:
- docker
cache:
--
GitLab