Update rit publish repo formulas (#373)

* merge master * resolve conflicts * merge upstream * update rit publish repo formulas Signed-off-by: GuillaumeFalourd <[email protected]> * correct linter Signed-off-by: GuillaumeFalourd <[email protected]>
ZupIT · Jul 26, 2021 · 35d5ef6 · 35d5ef6
1 parent a62b142
commit 35d5ef6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/github/publish/repo/src/unix/formula/formula.sh b/github/publish/repo/src/unix/formula/formula.sh
@@ -30,10 +30,6 @@ formatPackageName() {
   echo "$1" | tr "." "/"
 }
 
-parse_git_branch() {
-  echo | git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/'
-}
-
 runFormula() {
 
   slug_name=$(createSlug "$PROJECT_NAME")
@@ -48,8 +44,7 @@ runFormula() {
 
   echo "---------------------------------------------------------------------------"
 
-  branch=$(parse_git_branch)
-  echo "🌱 Using branch: $branch"
+  git config --global init.defaultBranch main
 
   if git rev-parse --git-dir > /dev/null 2>&1; then
     echo "🚧 This repository already exists. Preparing new commit..."
@@ -72,10 +67,12 @@ runFormula() {
     git remote add origin https://$USERNAME:$TOKEN@github.com/$USERNAME/$slug_name.git
   fi
 
-  git push origin $branch > /dev/null
+  branch=$(echo | git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/')
+  echo "🌱 Using branch: $branch"
+  git push -u origin $branch > /dev/null
 
   if [[ $DOCKER_EXECUTION ]]; then
-    chown 1000:1000 -R $CURRENT_PWD/$slug_name
+    chown 1000:1000 -R $CURRENT_PWD/$slug_name > /dev/null
   fi
 
   echo "---------------------------------------------------------------------------"

diff --git a/gitlab/publish/repo/src/unix/formula/formula.sh b/gitlab/publish/repo/src/unix/formula/formula.sh
@@ -37,14 +37,13 @@ runFormula() {
   cd $WORKSPACE_PATH
 
   if [ $? != 0 ]; then
-   cd -
-   exit 1
+    cd -
+    exit 1
   fi
 
   echo "---------------------------------------------------------------------------"
 
-  branch=$(parse_git_branch)
-  echo "🌱 Using branch: $branch"
+  git config --global init.defaultBranch main
 
   if git rev-parse --git-dir > /dev/null 2>&1; then
     echo "🚧 This repository already exists. Preparing new commit..."
@@ -68,7 +67,9 @@ runFormula() {
     git remote add origin https://oauth2:$TOKEN@gitlab.com/$USERNAME/$slug_name.git
   fi
 
-  git push origin $branch > /dev/null
+  branch=$(echo | git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/')
+  echo "🌱 Using branch: $branch"
+  git push -u origin $branch > /dev/null
 
   if [[ $DOCKER_EXECUTION ]]; then
     chown 1000:1000 -R $CURRENT_PWD/$slug_name