|
|
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](/uploads/ecc60f0f27b87e5ec24846dfeecab2a4/dev_pipeline.png)
|
|
|
|
|
|
This will take around 5 minutes. When finished you will either have a green checkmark indicating success:
|
|
|
![dev_pipeline_success](/uploads/52a71b07091bb7bd3b37029f2bbc0228/dev_pipeline_success.png)
|
|
|
|
|
|
Or a red 'X' indicating that something went wrong:
|
|
|
![dev_pipeline_fail](/uploads/701e28e375bfa1434998a0fbbe416235/dev_pipeline_fail.png)
|
|
|
|
|
|
If your pipeline was successful, proceed to the next section to request a merge to master. If your pipeline failed, you need to resolve the issues before requesting a merge. You can see the errors by clicking the red 'x' followed by 'test_acc':
|
|
|
![dev_pipeline_fail_click](/uploads/085a75208367f5fd1decd750cd833750/dev_pipeline_fail_click.png)
|
|
|
|
|
|
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 on your machine and then try pushing your branch again.
|
|
|
![dev_pipeline_fail_message](/uploads/6003c8a74ceceba2f0a258bd88d12510/dev_pipeline_fail_message.png)
|
|
|
|
|
|
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' (do not select 'Delete source branch').
|
|
|
![merge_final](/uploads/fbcdc057017c7d390869123afafdeaaa/merge_final.png)
|
|
|
|
|
|
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. |
|
|
\ No newline at end of file |