Merge Branch

This task is used to merge from one branch to another for a list of repositories.

Here are the steps in the task.

• it clones all projects defined in the checkout section into a workspace.
• if the workspace exists, then it will iterate each repository to switch to the branch specified in the checkout and pull from the remote.
• merge the from branch to the to branch locally.
• push the merged branch to the remote Git server

For live configuration example, please visit light-config-test.

Here is an example of the merge-branch.yml configuration file.

# This task is used to merge from one branch to another branch.
# Workspace that is used for this operation. Most of time, this is done on local.
workspace: mergebranch
# The from branch name that is going to be merged to
from_branch: develop
# The to branch name that is going to be merged to
to_branch: master
# You can skip checkout if you are sure that the code in workspace are the latest and
# you just want to repeat the merge branch process due to some environmental issue before.
skip_checkout: false
# You can skip the merge branch step is this has been done in the previous execution.
skip_merge: false
# You can skip the git push after the branch is created. The default is push to the git server.
skip_push: false
# clone and switch to the branch specified in checkout step.
checkout:
  - branch: master
    repository:
    - [email protected]:networknt/light-4j.git
    - [email protected]:networknt/json-overlay.git
    - [email protected]:networknt/openapi-parser.git
    - [email protected]:networknt/light-rest-4j.git
    - [email protected]:networknt/light-graphql-4j.git
    - [email protected]:networknt/light-hybrid-4j.git
    - [email protected]:networknt/light-codegen.git
    - [email protected]:networknt/light-eventuate-4j.git
    - [email protected]:networknt/light-tram-kafka.git
    - [email protected]:networknt/light-tram-4j.git
    - [email protected]:networknt/light-saga-4j.git
    - [email protected]:networknt/light-session-4j.git
    - [email protected]:networknt/light-spa-4j.git
    - [email protected]:networknt/light-proxy.git
    - [email protected]:networknt/light-router.git
    - [email protected]:networknt/light-oauth2.git
    - [email protected]:networknt/light-tokenization.git
    - [email protected]:networknt/light-consumer-4j.git
    - [email protected]:networknt/light-spring-boot.git
    - [email protected]:networknt/light-portal.git
    - [email protected]:networknt/light-example-4j.git
    - [email protected]:networknt/light-example-kotlin.git
    - [email protected]:networknt/light-doc.git
    - [email protected]:networknt/light-bot.git
    - [email protected]:networknt/light-docker.git
    - [email protected]:networknt/light-config-test.git
    - [email protected]:networknt/light-config-server.git
    - [email protected]:networknt/microservices-framework-benchmark.git
    - [email protected]:networknt/model-config.git
    - [email protected]:networknt/light-workflow-4j.git
    - [email protected]:networknt/light-config-prod.git