From 2279ee7d2094b071ef565788e77a9515a472c40e Mon Sep 17 00:00:00 2001
From: Bo-Chun Louis Chen <louistw@uab.edu>
Date: Thu, 8 Sep 2022 11:21:23 -0500
Subject: [PATCH] Add git remote upstream
---
.gitlab-ci.yml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4bd2318..0a57bd9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -48,10 +48,12 @@ setup_environment:
else
git clone https://github.com/uabrc/CRI_XCBC.git;
cd CRI_XCBC;
+ git remote add upstream https://github.com/jprorama/CRI_XCBC.git
fi
- >
+ git fetch upstream;
git checkout -b integration;
- git merge origin/uab-dev;
+ git merge upstream/uab-dev;
cd ..;
- s3cmd get --force --host=$AWS_HOST --host-bucket=$AWS_HOST s3://ood-config/group_vars/all CRI_XCBC/group_vars/all
- s3cmd get --force -r --host=$AWS_HOST --host-bucket=$AWS_HOST s3://cheaha-cloud-ansible-files/ ansible/files/
--
GitLab