Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
acc
acc
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 8
    • Issues 8
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Operations
    • Operations
    • Incidents
  • Packages & Registries
    • Packages & Registries
    • Container Registry
  • Analytics
    • Analytics
    • Repository
    • Value Stream
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Activity
  • Graph
  • Create a new issue
  • Commits
  • Issue Boards
Collapse sidebar
  • hla
  • accacc
  • Wiki
    • Developers
  • Accepting Merge Requests

Last edited by Spencer Kiy Feb 27, 2020
Page history

Accepting Merge Requests

A push of any branch to gitlab will trigger a CI/CD job that will check your branch for xml parsing errors, and that tags/attributes conform to acc standards. On the CI/CD page you will see a job with a blue status wheel showing that a pipeline is running: dev_pipeline

This will take around 5 minutes. When finished you will either have a green checkmark indicating success: dev_pipeline_success

Or a red 'X' indicating that something went wrong: dev_pipeline_fail

If a pipeline failed, the issues need to be resolved before it is merged into master. You can see the errors by clicking the red 'x' followed by 'test_acc': dev_pipeline_fail_click

This brings up a terminal-like output from the runner that executed the job. Error messages will likely be near the bottom. Resolve the issues. dev_pipeline_fail_message

In the above example there is a problem with the sequence file csb_db1.xml, and the issue is that there is an xml open tag that is missing a corresponding closing tag.

When someone requests a merge into master, you just need to check that their pipeline was successful before accepting. Navigate to the merge request page, make sure that there is a green checkmark beside the pipeline for their branch. If so, click 'Merge'. merge_final

If someone wants to merge changes and has added new attributes to a tag, their pipeline may fail. In this case:

  • Review the new tags/attributes and confirm they seem necessary
  • Checkout/Pull the persons dev branch
  • Add the new tags/attributes to the config file 'xml_allowed_tags.ini' on their branch.
  • Commit and push their branch to gitlab, confirm the pipeline passes.
  • Merge their branch into master.
Clone repository
  • Developers
    • Accepting Merge Requests
    • Making Changes to Acc
    • Pushing to Staging & Beta
  • Home
  • making TRANSOPTR files from acc
  • manually scaling tunes in acc
  • unify