From 73cd3724b908fe9cb731030f853baa2e3111681e Mon Sep 17 00:00:00 2001 From: Javier Carrillo Milla Date: Thu, 9 Sep 2021 12:34:13 +0200 Subject: [PATCH 1/2] adds deploy script --- scripts/deploy.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100755 scripts/deploy.sh diff --git a/scripts/deploy.sh b/scripts/deploy.sh new file mode 100755 index 00000000..da87af40 --- /dev/null +++ b/scripts/deploy.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env bash + +read -p "Deploy care, health and fresenius? (y/n) " answer + +git checkout master +git pull + +for env in care health fresenius; do + echo "" + echo "Deplopying $env" + echo "--" + git checkout env/$env + git pull origin master + git push origin env/$env +done + +echo "" From 36a321274479b6af8fd61ada742b08c74bc08e85 Mon Sep 17 00:00:00 2001 From: Javier Carrillo Milla Date: Thu, 9 Sep 2021 12:40:08 +0200 Subject: [PATCH 2/2] use merge instead of pull (we pulled already) --- scripts/deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/deploy.sh b/scripts/deploy.sh index da87af40..b920c3c7 100755 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -10,7 +10,7 @@ for env in care health fresenius; do echo "Deplopying $env" echo "--" git checkout env/$env - git pull origin master + git merge master git push origin env/$env done