dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

devel-docs: some document updates. 

For the release-howto (release process update) and the gitlab-mr document
(updating the git endpoint).
This commit is contained in:
Jehan 2022-11-14 21:33:54 +01:00
parent 8c5e3887f9
commit fde0315cb3
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devel-docs/gitlab-mr.md
View File

@ -74,7 +74,7 @@ Edit your `.git/config` by adding a second "fetch =" rule to the
[remote "origin"]
fetch = +refs/heads/*:refs/remotes/origin/*
fetch = +refs/merge-requests/*/head:refs/remotes/origin/merge-requests/*
url = git@gitlab.gnome.org:GNOME/gimp.git
url = git@ssh.gitlab.gnome.org:GNOME/gimp.git
```
From now on, when you `git pull` or `git fetch` the origin remote, any
@ -105,7 +105,7 @@ So we will fetch the remote yet without naming the remote:
their own remote, you would run:
```
git fetch "git@gitlab.gnome.org:xyz/gimp.git" 'fix-bug-123'
git fetch "git@ssh.gitlab.gnome.org:xyz/gimp.git" 'fix-bug-123'
git checkout -b 'xyz/fix-bug-123' FETCH_HEAD
```
@ -115,7 +115,7 @@ git checkout -b 'xyz/fix-bug-123' FETCH_HEAD
- Finally push to the contributor's own remote with the call:
```
git push git@gitlab.gnome.org:xyz/gimp.git xyz/fix-bug-123:fix-bug-123
git push git@ssh.gitlab.gnome.org:xyz/gimp.git xyz/fix-bug-123:fix-bug-123
```
This assumes that the contributor checked the option "*Allow commits

20
devel-docs/release-howto.txt
View File

@ -64,8 +64,7 @@
( ) Check if NEWS, authors.xml (and the generated AUTHORS), README or
INSTALL need to be updated, as well as any release notes on
gimp.org. Don't forget to add any "Index of new symbols in GIMP
3.x" to the gtk-doc generated devel-docs.
gimp.org.
( ) Does the splash screen need to be changed?
@ -105,20 +104,25 @@
tag, which is characteristical of a release).
[ ] The following jobs should be triggered:
build-image, deps-debian, gimp-distcheck-debian, sources,
deps-win32-native, gimp-win32-native, packaging-win32-native,
deps-win64-native, gimp-win64-native, packaging-win64-native
and win-installer-nightly.
build-image deps-debian gimp-distcheck-debian sources-autotools
gimp-meson-debian sources-meson
dev-docs
deps-win32-native gimp-win32-native packaging-win32-native
deps-win64-native gimp-win64-native packaging-win64-native win-installer-nightly
[ ] Check in particular:
* the job `win-installer-nightly` should contain a working
Windows installer and 2 checksum files;
* the job `sources` should contain a tar.bz2 tarball and 2
* the job `sources-autotools` should contain a tar.bz2 tarball and 2
checksum files.
* the job `sources-meson` should contain a tar.xz tarball and 2
checksum files.
* the job `dev-docs` should contain a tar.xz tarball and 2
checksum files.
If these steps work fine, we are ready to tag and publish.
Note: the test build will likely take up to 2 hours, especially
Note: the test build will likely take up to 1 hour, especially
because of the Windows installer step. And of course, if you ever
discover any build or run into issues, the time will be multiplied.
It is advised to take this in consideration. This test step could