From e418158e1c5a96bf9206e12d5a6aa0162540af25 Mon Sep 17 00:00:00 2001
From: Pietro Incardona <incardon@mpi-cbg.de>
Date: Sun, 18 Nov 2018 18:46:52 +0100
Subject: [PATCH] retry
---
.gitlab-ci.yml | 15 +++------------
build.sh | 1 -
openfpm_vcluster | 2 +-
3 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cfca6762..71aafdcc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ centos_build:
- centos
artifacts:
paths:
- - ./build/src/pdata
+ - ./build/src/vcluster
script:
- ./build.sh $CI_PROJECT_DIR $CI_RUNNER_TAGS pdata full $CI_COMMIT_REF_NAME
@@ -16,9 +16,6 @@ centos_run:
- centos_build
script:
- ./run.sh $CI_PROJECT_DIR $CI_RUNNER_TAGS 1 pdata full $CI_COMMIT_REF_NAME
- - ./run.sh $CI_PROJECT_DIR $CI_RUNNER_TAGS 3 pdata full $CI_COMMIT_REF_NAME
- - ./run.sh $CI_PROJECT_DIR $CI_RUNNER_TAGS 4 pdata full $CI_COMMIT_REF_NAME
- - ./run.sh $CI_PROJECT_DIR $CI_RUNNER_TAGS 5 pdata full $CI_COMMIT_REF_NAME
mac_build:
@@ -27,7 +24,7 @@ mac_build:
- mac
artifacts:
paths:
- - ./build/src/pdata
+ - ./build/src/vcluster
script:
- ./build.sh $CI_PROJECT_DIR $CI_RUNNER_TAGS pdata full $CI_COMMIT_REF_NAME
@@ -39,9 +36,6 @@ mac_run:
- mac_build
script:
- ./run.sh $CI_PROJECT_DIR $CI_RUNNER_TAGS 1 pdata full $CI_COMMIT_REF_NAME
- - ./run.sh $CI_PROJECT_DIR $CI_RUNNER_TAGS 3 pdata full $CI_COMMIT_REF_NAME
- - ./run.sh $CI_PROJECT_DIR $CI_RUNNER_TAGS 4 pdata full $CI_COMMIT_REF_NAME
- - ./run.sh $CI_PROJECT_DIR $CI_RUNNER_TAGS 5 pdata full $CI_COMMIT_REF_NAME
ubuntu_build:
stage: build
@@ -49,7 +43,7 @@ ubuntu_build:
- ubuntu
artifacts:
paths:
- - ./build/src/pdata
+ - ./build/src/vcluster
script:
- ./build.sh $CI_PROJECT_DIR $CI_RUNNER_TAGS pdata full $CI_COMMIT_REF_NAME
@@ -61,7 +55,4 @@ ubuntu_run:
- ubuntu_build
script:
- ./run.sh $CI_PROJECT_DIR $CI_RUNNER_TAGS 1 pdata full $CI_COMMIT_REF_NAME
- - ./run.sh $CI_PROJECT_DIR $CI_RUNNER_TAGS 3 pdata full $CI_COMMIT_REF_NAME
- - ./run.sh $CI_PROJECT_DIR $CI_RUNNER_TAGS 4 pdata full $CI_COMMIT_REF_NAME
- - ./run.sh $CI_PROJECT_DIR $CI_RUNNER_TAGS 5 pdata full $CI_COMMIT_REF_NAME
diff --git a/build.sh b/build.sh
index 7dd04d70..d27da42f 100755
--- a/build.sh
+++ b/build.sh
@@ -17,7 +17,6 @@ fi
#if [ x"$3" == x"osx" ]; then
# rm -rf $HOME/openfpm_dependencies/openfpm_pdata/$6/OPENBLAS
-#
#fi
if [ x"$6" == x"" ]; then
diff --git a/openfpm_vcluster b/openfpm_vcluster
index 1fdaace8..6ae300fd 160000
--- a/openfpm_vcluster
+++ b/openfpm_vcluster
@@ -1 +1 @@
-Subproject commit 1fdaace82b6b3a96fd33c5f710f40562be71f7c7
+Subproject commit 6ae300fdcd4ffae4e1039c0661901657bdfdcfa1
--
GitLab