...
| Code Block |
|---|
| language | bash |
|---|
| title | merge-changes.sh |
|---|
|
#!/bin/bash
# Load configuration
source ./configuration.sh
# Change to source directory
cd ${WORK_DIR}/${GIT_REPO}
# Fetch current upstream branch
git fetch upstream
# Rebase upstream changes
git checkout ${GIT_SOURCE_BRANCH}
git rebase upstream/${GIT_SOURCE_BRANCH}
# Merge changes
git merge --no-ff ${GIT_CANDIDATE_BRANCH} --gpg-sign=${GIT_SIGNING_KEY} -m "${JIRA_ISSUE} Merged ${GIT_CANDIDATE_BRANCH}"
# Push changes to source repository
git push upstream ${GIT_SOURCE_BRANCH} |
Set Next Version
Set next snapshot version and push to source repository.
| Code Block |
|---|
| language | bash |
|---|
| title | merge-changes.sh |
|---|
|
#!/bin/bash
# Load configuration
source ./configuration.sh
# Change to source directory
cd ${WORK_DIR}/${GIT_REPO}
# Set Next Snapshot Version
./mvnw versions:set -DgenerateBackupPoms=false -DnewVersion=${NEXT_SNAPSHOT_VERSION}
# Commit Version
git commit --gpg-sign=${GIT_SIGNING_KEY} -a --author "${GIT_AUTHOR}" -m "${JIRA_ISSUE} Updated version to ${NEXT_SNAPSHOT_VERSION}"
# Push Updated Version
git push upstream |