From fde0315cb3630c03f8526c6a4b06f8fb0490ccf8 Mon Sep 17 00:00:00 2001 From: Jehan Date: Mon, 14 Nov 2022 21:33:54 +0100 Subject: [PATCH] devel-docs: some document updates. For the release-howto (release process update) and the gitlab-mr document (updating the git endpoint). --- devel-docs/gitlab-mr.md | 6 +++--- devel-docs/release-howto.txt | 20 ++++++++++++-------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/devel-docs/gitlab-mr.md b/devel-docs/gitlab-mr.md index 8a87d2d574..5ef3979c7d 100644 --- a/devel-docs/gitlab-mr.md +++ b/devel-docs/gitlab-mr.md @@ -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 diff --git a/devel-docs/release-howto.txt b/devel-docs/release-howto.txt index 2e9709fb57..aea532d936 100644 --- a/devel-docs/release-howto.txt +++ b/devel-docs/release-howto.txt @@ -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