Skip to content

Commit

Permalink
Fix git-setup.sh (calcom#15560)
Browse files Browse the repository at this point in the history
  • Loading branch information
hariombalhara authored Jun 25, 2024
1 parent f38f98a commit 3fe26f1
Showing 1 changed file with 12 additions and 5 deletions.
17 changes: 12 additions & 5 deletions git-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# If no project name is given
if [ $# -eq 0 ]; then
# Display usage and stop
echo "Usage: git-setup.sh <console,website>"
echo "Usage: git-setup.sh <console,website,platform>"
exit 1
fi
# Get remote url to support either https or ssh
Expand All @@ -21,11 +21,18 @@ for module in "$@"; do
git config -f .gitmodules --unset-all "submodule.apps/$module.branch"
# Add the submodule
git submodule add --force $project "apps/$module"
# Set the default branch to main
git config -f .gitmodules --add "submodule.apps/$module.branch" main

# Update to the latest from main in that submodule
cd apps/$module && git pull origin main && cd ../..
# Determine the branch based on module
branch="main"
if [ "$module" = "website" ]; then
branch="production"
fi

# Set the default branch
git config -f .gitmodules --add "submodule.apps/$module.branch" ${branch}

# Update to the latest of branch in that submodule
cd apps/$module && git pull origin ${branch} && cd ../..

# We forcefully added the subdmoule which was in .gitignore, so unstage it.
git restore --staged apps/$module
Expand Down

0 comments on commit 3fe26f1

Please sign in to comment.