... | ... | @@ -7,15 +7,15 @@ This will take around 5 minutes. When finished you will either have a green chec |
|
|
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':
|
|
|
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](/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.
|
|
|
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](/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').
|
|
|
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](/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:
|
... | ... | |