From d889ef25f20ca77a510d93019794852434facd6e Mon Sep 17 00:00:00 2001
From: Pietro Incardona <incardon@mpi-cbg.de>
Date: Sun, 14 Jun 2020 10:35:39 +0200
Subject: [PATCH] Activating mac
---
.gitlab-ci.yml | 36 +++++++++++++++++++-----------------
1 file changed, 19 insertions(+), 17 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f7e5d6125..e97e65a6d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,24 +28,26 @@ centos_run:
- ./run.sh $CI_PROJECT_DIR unused 3 0 0 numerics
- ./run.sh $CI_PROJECT_DIR unused 4 0 0 numerics
- #mac_build:
- # stage: build
- # tags:
- # - mac
- # artifacts:
- # paths:
- # - ./build/src/pdata
- # script:
- # - ./build.sh $CI_PROJECT_DIR unused pdata full $CI_COMMIT_REF_NAME
+mac_build:
+ stage: build
+ tags:
+ - mac
+ artifacts:
+ paths:
+ - ./build/src/pdata
+ - ./build/openfpm_numerics/src/numerics
+ - ./openfpm_numerics/test
+ script:
+ - ./build.sh $CI_PROJECT_DIR unused pdata 0 $CI_COMMIT_REF_NAME
- #mac_run:
- # stage: test
- # tags:
- # - mac
- # dependencies:
- # - mac_build
- # script:
- # - ./run.sh $CI_PROJECT_DIR unused 1 pdata full $CI_COMMIT_REF_NAME
+mac_run:
+ stage: test
+ tags:
+ - mac
+ dependencies:
+ - mac_build
+ script:
+ - ./run.sh $CI_PROJECT_DIR unused 1 0 0 $CI_COMMIT_REF_NAME
ubuntu_build:
stage: build
--
GitLab