Skip to content
Snippets Groups Projects
Commit 516c5cb1 authored by Emanuele Aina's avatar Emanuele Aina
Browse files

gitlab-based_packaging_workflow: Explain when a manual sync may be needed


Signed-off-by: Emanuele Aina's avatarEmanuele Aina <emanuele.aina@collabora.com>
parent e7b23d06
No related branches found
No related tags found
1 merge request!2gitlab-based_packaging_workflow: Use the same tools used in CI
Pipeline #122153 passed
...@@ -52,7 +52,21 @@ either boot the Apertis [SDK]( {{< ref "/sdk.md" >}} ) or enter the ...@@ -52,7 +52,21 @@ either boot the Apertis [SDK]( {{< ref "/sdk.md" >}} ) or enter the
docker pull docker-registry.apertis.org/apertis/apertis-${APERTIS_RELEASE}-package-source-builder docker pull docker-registry.apertis.org/apertis/apertis-${APERTIS_RELEASE}-package-source-builder
docker run -it --rm --env HOME -w "$(pwd)" -v "$HOME:$HOME" -v "$HOME:/root" --security-opt label=disable apertis-${APERTIS_RELEASE}-package-source-builder bash docker run -it --rm --env HOME -w "$(pwd)" -v "$HOME:$HOME" -v "$HOME:/root" --security-opt label=disable apertis-${APERTIS_RELEASE}-package-source-builder bash
## How to sync an Apertis package with a new version from Debian ## How to manually sync an Apertis package with a new version
Upstream updates are usually handled automatically by the
[`ci-update-from-upstream.yml`](https://gitlab.apertis.org/infrastructure/ci-package-builder/)
Continous Integration pipeline, which fetches upstream packages, merges them
with the Apertis contents and directly creates Merge Requests to be reviewed
by maintainers.
However, in some cases it is necessary to manuall pull upstream contents:
1. the CI failed to merge the upstream update with the downstream changes, so a
developer must reproduce the merge and fix the conflicts
1. for some reason it in necessary to manually pull updates from a new upstream
distribution/suite
The steps below can guide you on manually pulling upstream updates:
1. On GitLab, [fork the 1. On GitLab, [fork the
project](https://docs.gitlab.com/ce/user/project/repository/forking_workflow.html) project](https://docs.gitlab.com/ce/user/project/repository/forking_workflow.html)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment