Jump to content

Neon/Git: Difference between revisions

From KDE Community Wiki
← Older edit
Sgclark (talk | contribs)
trusted
34 edits
Update to Salsa
Riddell (talk | contribs)
KDEDevelopers, trusted
1,131 edits
 
(4 intermediate revisions by 2 users not shown)
Line 1: Line 1:
The Neon Git repositories are at http://packaging.neon.kde.org
The Neon Git repositories are at https://invent.kde.org/neon


All KDE contributors can commit to Neon/* branches or any branch for repositories under neon/, forks/, neon-packages/ directories, it will reject commits to other branches.
All KDE contributors can commit to Neon/* branches or any branch for repositories under neon/, forks/, neon-packages/ directories, it will reject commits to other branches.
Line 7: Line 7:
Add this to <code>~/.gitconfig</code>
Add this to <code>~/.gitconfig</code>
{{Input|1=<nowiki>
{{Input|1=<nowiki>
[url "git://anongit.neon.kde.org/"]
[url "git@invent.kde.org:"]
     insteadOf = neon:
     insteadOf = invent:
[url "neon@git.neon.kde.org:"]
[url "git@invent.kde.org:"]
     pushInsteadOf = neon:
     pushInsteadOf = invent:
</nowiki>}}
</nowiki>}}
and clone with:
and clone with:
{{Input|1=<nowiki>git clone neon:kde/khotkeys</nowiki>}}
{{Input|1=<nowiki>git clone invent:neon/kde/khotkeys</nowiki>}}


=== Anonymous Access ===
=== Anonymous Access ===


If you don't have a KDE account you can still clone the repo at
If you don't have a KDE account you can still clone the repo at
{{Input|1=<nowiki>git clone git://anongit.neon.kde.org/kde/khotkeys</nowiki>}}
{{Input|1=<nowiki>git clone https://invent.kde.org/neon/kde/khotkeys</nowiki>}}


=== Admin ===
=== Settings up new repositories ===


The repository <code>neon:gitolite-admin</code> has gitolite setup, hooks and hook server for those with admin rights (kde sysadmin does). Don't use anongit to check this out, do an explicit <code>git clone neon@git.neon.kde.org:gitolite-admin</code>
This is now done through invent.kde.org which can also be set to clone another git repo


<code>neon-hooks/pre-receive</code> is a hook to check the branch can be committed to
=== Pushing merges ===


<code>debian-hooks/debian-to-neon-post-receive</code> is a hook for Debian pkg-kde Git repos to ping the neon server on updates
KDE git has a hook to prevent 100s of commits in one push but sometimes that is what we need if we are merging in from e.g. Debian.  Push with
 
{{Input|1=<nowiki>git push -o notification.summarise</nowiki>}}
<code>server/neon-fetch-request-server.py</code> is an XML-RPC server run on the neon server which is called by the Debian hook and fetches updates from the Debian repos into the equivalent branches in our repos
This will also disable some check with backports-focal etc for when syncing with Debian and their commits have translations and funny e-mail addresses that pre-commit hooks would block.
 
<code>maintenance/</code> scripts sync that all the Debian pkg-kde repos also exist on Neon Git.
 
<code>local/hooks/common/post-receive</code> pings the neon and DCI Jenkins servers to start a new build.
 
It uses gitolite3 on code.kde.org, administrated by the KDE sysadmin team.
 
Web interface is cgit.
 
Should you get a DuplicatedRepos (from DuplicatedRepos.Check) error during job updater because Debian has added a repo which was already in neon-packaging/ you will have to create Neon branches in the neon (aka neon:extras/coolpackage) sync of the Debian repo, remove the old repo from neon's gitolite conf and file a request to KDE sysadmin on phabricator to have the old ( aka fork/coolpackage ) deleted. Please ask when unsure.
 
=== Settings up new repositories ===


To set up a new repository it is nice to make it first on the Debian server so the syncing is already set up and Debian/Kubuntu packagers know to use it. 
=== Archiving Repos ===
* Ask someone in #debian-qt-kde to create a repo in salsa - provide a link to upstream source when asking.
* The repository should get automatically get picked up by neon infrastructure at most 60 minutes after creation
* Make a Neon/unstable branch on the neon git repo and get a Jenkins admin to run <code>pangea-tooling jenkins_jobs_update_nci.rb</code>


To add a new repo directly to Neon under forks/ neon/ or neon-packaging/ ask an admin (Jonathan, Harald etc) to add it to the gitolite-admin conf/gitolite.conf file. Then check it out directly from the master server, it won't be mirrored to the anongit server, e.g. <code>git clone neon@git.neon.kde.org:forks/mustache-d</code> and add a commit to master.
Archiving/removing of a repo can only be done by sysadmins you have to [https://phabricator.kde.org/maniphest/task/edit/form/2/ file a ticket]. Additionally to hide the projects immediately from the CI tooling you can add the topic 'neon-archived' in the general projects settings on gitlab (obviously only if you have neon admin access) e.g https://invent.kde.org/neon/neon-packaging/plasma-systemmonitor/edit
If the repo is a fork of debian packaging outside of pkg-kde, then create a mirror of said repo.
To set up a mirror:
e.g.<code>git clone https://salsa.debian.org/science-team/kbibtex</code>
<code>cd kbibtex</code>
<code>git push --mirror neon:forks/kbibtex</code>
Then create neon branches as usual.


=== The Set Up===
=== The Set Up===

Latest revision as of 13:46, 18 October 2021

The Neon Git repositories are at https://invent.kde.org/neon

All KDE contributors can commit to Neon/* branches or any branch for repositories under neon/, forks/, neon-packages/ directories, it will reject commits to other branches.

They are clones of the repositories used by Debian pkg-kde team https://salsa.debian.org/qt-kde-team/. Any commits made to a Debian pkg-kde repository will be pulled into Neon Git immediately.

Add this to ~/.gitconfig 

[url "[email protected]:"]
    insteadOf = invent:
[url "[email protected]:"]
    pushInsteadOf = invent:

and clone with: 

git clone invent:neon/kde/khotkeys

Anonymous Access

If you don't have a KDE account you can still clone the repo at 

git clone https://invent.kde.org/neon/kde/khotkeys

Settings up new repositories

This is now done through invent.kde.org which can also be set to clone another git repo

Pushing merges

KDE git has a hook to prevent 100s of commits in one push but sometimes that is what we need if we are merging in from e.g. Debian. Push with 

git push -o notification.summarise

This will also disable some check with backports-focal etc for when syncing with Debian and their commits have translations and funny e-mail addresses that pre-commit hooks would block.

Archiving Repos

Archiving/removing of a repo can only be done by sysadmins you have to file a ticket. Additionally to hide the projects immediately from the CI tooling you can add the topic 'neon-archived' in the general projects settings on gitlab (obviously only if you have neon admin access) e.g https://invent.kde.org/neon/neon-packaging/plasma-systemmonitor/edit

The Set Up

  • neon:gitolite-admin has hooks in .gitolite/hooks/common which are symlinks to neon-hooks/ that get added to new repositories
  • .gitolite/hooks/update is the normal hook from gitolite that does whatever gitolite needs
  • neon-hooks/post-receive pings jenkins to start a new build
  • neon-hooks/pre-receive rejects pushes to non-neon branches and sets up remote to Debian if it exists
  • neon/website and neon/releases.neon.kde.org have a post-receive hook to update their websites (no longer used for websites at least)
  • cron on the gitolite server runs bits to restart the servers and run the check scripts:
# Hourly sync of new repositories from salsa.debian.org
@hourly python3 ~/config-sync/gitolite-admin/maintenance/update-gitolite-setup.py
# Daily full sync of all repositories from salsa.debian.org
@daily python3 ~/config-sync/gitolite-admin/maintenance/update-gitolite-setup.py --fetch-all-repositories
Retrieved from "https://community.kde.org/index.php?title=Neon/Git&oldid=93314"