Skip to content
Permalink
Browse files

Check for branch to merge to give the possibility to merge a hotfix b…

…ranch instead of develop
  • Loading branch information...
Johannes Weiß
Johannes Weiß committed Jun 19, 2019
1 parent 4e5ad6c commit 5a5186f5a9850b2c426d6263d1d209fc68315a08
Showing with 11 additions and 4 deletions.
  1. +11 −4 scripts/ci/building/merge_branch_into_release.sh
@@ -1,9 +1,9 @@
#!/bin/bash

echo "prepare some variables"
echo "bamboo_planRepository_branchName=$bamboo_planRepository_branchName"
echo "bamboo_osm_branch_to_merge=$bamboo_osm_branch_to_merge"
echo "########################################'"
echo "start bamboo job to merge $bamboo_planRepository_branchName into release"
echo "start bamboo job to merge $bamboo_osm_branch_to_merge into release"
echo "########################################'"
remote=origin

@@ -24,5 +24,12 @@ git tag -d $(git tag -l)
git fetch --all
echo "git checkout release"
git checkout release
echo "git merge $bamboo_planRepository_branchName"
git merge $bamboo_planRepository_branchName

target_branch="develop"

if [[ "$bamboo_osm_branch_to_merge" != "develop" ]]; then
target_branch="origin/$bamboo_osm_branch_to_merge"
fi

echo "git merge $target_branch"
git merge $target_branch

0 comments on commit 5a5186f

Please sign in to comment.
You can’t perform that action at this time.