Commit e710016b authored by Chris Lamb's avatar Chris Lamb 👀
Browse files

s/stretch/buster/ to avoid copy-paste issues.

parent c53362f1

git-workflow-lts.rst

+11 −11
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ Prepare a new repository 
   Please check whether an original package is using git-workflow/Salsa-CI already. If so, it is preferred to fork the maintainer's existing repo to reduce resource consumption on Salsa.





As an example, the package ``admesh`` for the LTS upload into ``debian/stretch`` will be used. You will of course have to use your own package name and corresponding release.

As an example, the package ``admesh`` for the LTS upload into ``debian/buster`` will be used. You will of course have to use your own package name and corresponding release.





#. First check whether the repository for this package exists. If yes; skip these steps and go to the *Prepare an upload...* section.
@@ -34,14 +34,14 @@ As an example, the package ``admesh`` for the LTS upload into ``debian/stretch`` 
#. For the "Project name" field, enter ``admesh``.

#. Press "Create project".



We are using the `DEP-14 <https://dep-team.pages.debian.net/deps/dep14/>`_ schema, where the branches are named according to the releases, such as ``debian/stretch``\ , ``debian/jessie``\ , etc.

We are using the `DEP-14 <https://dep-team.pages.debian.net/deps/dep14/>`_ schema, where the branches are named according to the releases, such as ``debian/buster``\ , ``debian/jessie``\ , etc.



We drop the ``main`` branch and create corresponding branches.





#. Go to "Repository->branches" and press "New branch".

#. Branch name -> ``debian/stretch`` or any other suite, which is needed for your work now.

#. Go to  "Settings->Repository->Default Branch" and choose ``debian/stretch``->"Save changes".

#. Branch name -> ``debian/buster`` or any other suite, which is needed for your work now.

#. Go to  "Settings->Repository->Default Branch" and choose ``debian/buster``->"Save changes".

#. Go to "Repository->Branches" and remove ``main`` branch.



Setting up a CI
@@ -87,14 +87,14 @@ Assume, you have a folder "orig" where the current version of the package is dow 
   .. code-block::



       git checkout -b upstream

       gbp import-orig --debian-branch=debian/stretch --pristine-tar  ../orig/admesh_0.98.2.orig.tar.xz

       gbp import-orig --debian-branch=debian/buster --pristine-tar  ../orig/admesh_0.98.2.orig.tar.xz



#. 

   Import initial debian-folder:



   .. code-block::



       git checkout debian/stretch

       git checkout debian/buster

       cp -r ../orig/admesh-0.98.2/debian .

       git add debian

       git commit -am'Initial import of debian/ folder'
@@ -111,7 +111,7 @@ Assume, you have a folder "orig" where the current version of the package is dow 


   .. code-block::



       gbp buildpackage --git-tag-only --git-sign-tags --git-debian-branch=debian/stretch

       gbp buildpackage --git-tag-only --git-sign-tags --git-debian-branch=debian/buster



Add gitlab-ci.yml

^^^^^^^^^^^^^^^^^
@@ -126,7 +126,7 @@ Add gitlab-ci.yml 
       - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml



       variables:

           RELEASE: 'stretch'

           RELEASE: 'buster'

           SALSA_CI_COMPONENTS: 'main contrib non-free'

           SALSA_CI_DISABLE_REPROTEST: 1

           SALSA_CI_DISABLE_LINTIAN: 1
@@ -136,7 +136,7 @@ Add gitlab-ci.yml 


   .. code-block::



       wget https://salsa.debian.org/lts-team/packages/miscellaneous/-/raw/main/stretch/.gitlab-ci.yml -P debian

       wget https://salsa.debian.org/lts-team/packages/miscellaneous/-/raw/main/buster/.gitlab-ci.yml -P debian



   The full documentation for the Debian pipeline `may be found on the salsa-ci-team/pipeline repository <https://salsa.debian.org/salsa-ci-team/pipeline>`_.
@@ -179,7 +179,7 @@ Prepare an upload of the already existing package 


   .. code-block::



       gbp buildpackage --git-debian-branch=debian/stretch

       gbp buildpackage --git-debian-branch=debian/buster



#. 

   After ``git push`` you can check the `status of the package <https://salsa.debian.org/lts-team/packages/admesh/-/pipelines>`_
@@ -189,5 +189,5 @@ Prepare an upload of the already existing package 


   .. code-block::



       gbp buildpackage --git-tag-only --git-sign-tags --git-debian-branch=debian/stretch 

       gbp buildpackage --git-tag-only --git-sign-tags --git-debian-branch=debian/buster 

       git push --tags