New Issue

[RELEASE] Forgejo v1.18.5-0 #386

Closed

opened by dachary · 0 comments

dachary commented

Owner

merge v1.18/forgejo-development which contains [SECURITY] default to pbkdf2 with 320,000 iterations

cherry pick commits from Gitea release/v1.18 on v1.18/forgejo:

commits added since the last rebase

$ git log --oneline --no-merges forgejo/v1.18/forgejo..gitea/release/v1.18
48eb5ac68 (tag: v1.18.5, gitea/release/v1.18) Changelog 1.18.5 (#23045)
8f5b2f1dd Return empty url for submodule tree entries (#23043) (#23048)
bbfd34575 Display attachments of review comment when comment content is blank (#23035) (#23046)
760cf419b Use beforeCommit instead of baseCommit (#22949) (#22996)
90982bffa Add force_merge to merge request and fix checking mergable (#23010) (#23032)
8fa62be90 Render access log template as text instead of HTML (#23013) (#23025)
7b3ffe574 Fix the Manually Merged form (#23015) (#23017)
c50d4202e  Use `--message=%s` for git commit message (#23028) (#23029)
660a83bd2 Hide 2FA status from other members in organization members list (#22999) (#23023)

Skip 90982bffa Add force_merge to merge request and fix checking mergable (#23010) (#23032) because it is only meant to fix a regression introduced by e4238583db Improve trace logging for pulls and processes which is not included in Forgejo.
Cherry-pick git cherry-pick -x 660a83bd2 c50d4202e 7b3ffe574 8fa62be90 760cf419b bbfd34575 8f5b2f1dd 48eb5ac68
Revert 660a83bd2 Hide 2FA status from other members in organization members list (#22999) (#23023) because there is no consensus it is a desirable change in Forgejo

The last rebase on top of Gitea reverted the following:
- 1d191f9b5a Adding a reply to an outdated review appears to not post (but still does) because it is too complex and can lead to regressions
- e4238583db Improve trace logging for pulls and processes because it is a feature that is not strictly necessary
v1.18/forgejo CI https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/678
publish for testing at https://codeberg.org/forgejo-experimental/ under v1.18.5-0
- force-push v1.18/forgejo branch to forgejo-integration
- push tag to forgejo-integration to start build https://ci.dachary.org/forgejo-integration/forgejo/pipeline/127
- force-push v1.18/forgejo branch to https://codeberg.org/forgejo-experimental/forgejo
- delete existing tag v1.18.5-0 from https://codeberg.org/forgejo-experimental/forgejo if it exists
- force-push v1.18/forgejo branch to https://codeberg.org/forgejo/experimental
- push tag to https://codeberg.org/forgejo/experimental https://ci.dachary.org/forgejo/experimental/pipeline/33
- end-to-end testing https://ci.dachary.org/dachary/scripted-configuration/pipeline/130
  - git clone -b wip-lxc https://codeberg.org/earl-warren/scripted-configuration/
  - change hosts/forgejo-ci/tests/inside_test.sh to : ${FORGEJO_IMAGE:=codeberg.org/forgejo-experimental/forgejo}
prepare release notes #422
- Gitea changes
- Alpine changes for git, gnupg, sqlite, openssh
release 1.18.5-0 by pushing the tag to https://codeberg.org/forgejo/release/ (not with the web interface) https://ci.dachary.org/forgejo/release/pipeline/9
publish the release notes by merging the forgejo-development branch into the forgejo branch
publish blog post forgejo/website#111
~~rebuild main on https://codeberg.org/Forgejo/website~~ (there is no need because the blog post being published will do that)

publish and pin toot https://floss.social/@forgejo/109915906721420383

#Forgejo v1.18.5-0 was just released! This is a security release. 

We strongly recommend that all installations are upgraded to the latest version as soon as possible.

Check out the release notes and download it at https://forgejo.org/releases/. If you experience any issues with this release, please report to https://codeberg.org/forgejo/forgejo/issues.

DNS update via OVH
close the milestone

- [x] merge v1.18/forgejo-development which contains [[SECURITY] default to pbkdf2 with 320,000 iterations](https://codeberg.org/forgejo/forgejo/pulls/407) - [x] cherry pick commits from Gitea release/v1.18 on [v1.18/forgejo](https://codeberg.org/forgejo/forgejo/src/branch/v1.18/forgejo): - commits added since the last rebase ``` $ git log --oneline --no-merges forgejo/v1.18/forgejo..gitea/release/v1.18 48eb5ac68 (tag: v1.18.5, gitea/release/v1.18) Changelog 1.18.5 (#23045) 8f5b2f1dd Return empty url for submodule tree entries (#23043) (#23048) bbfd34575 Display attachments of review comment when comment content is blank (#23035) (#23046) 760cf419b Use beforeCommit instead of baseCommit (#22949) (#22996) 90982bffa Add force_merge to merge request and fix checking mergable (#23010) (#23032) 8fa62be90 Render access log template as text instead of HTML (#23013) (#23025) 7b3ffe574 Fix the Manually Merged form (#23015) (#23017) c50d4202e Use `--message=%s` for git commit message (#23028) (#23029) 660a83bd2 Hide 2FA status from other members in organization members list (#22999) (#23023) ``` - **Skip** [90982bffa Add force_merge to merge request and fix checking mergable (#23010) (#23032)](https://github.com/go-gitea/gitea/commit/90982bffa) because it is only meant to fix a regression introduced by e4238583db1647e05d0d664e5b2adae80b6270dc [Improve trace logging for pulls and processes](https://github.com/go-gitea/gitea/commit/e4238583db1647e05d0d664e5b2adae80b6270dc) which is **not** included in Forgejo. - **Cherry-pick** `git cherry-pick -x 660a83bd2 c50d4202e 7b3ffe574 8fa62be90 760cf419b bbfd34575 8f5b2f1dd 48eb5ac68` - **Revert** 660a83bd2 Hide 2FA status from other members in organization members list (#22999) (#23023) because [there is no consensus](https://codeberg.org/forgejo/forgejo/issues/421) it is a desirable change in Forgejo - [x] The [last rebase on top of Gitea](https://codeberg.org/forgejo/forgejo/milestone/3513) reverted the following: - 1d191f9b5a262a9933c6024e051161dc90aa7f22 [Adding a reply to an outdated review appears to not post (but still does)](https://github.com/go-gitea/gitea/commit/1d191f9b5a262a9933c6024e051161dc90aa7f22) because it is too complex and can lead to regressions - e4238583db1647e05d0d664e5b2adae80b6270dc [Improve trace logging for pulls and processes](https://github.com/go-gitea/gitea/commit/e4238583db1647e05d0d664e5b2adae80b6270dc) because it is a feature that is not strictly necessary - [x] [v1.18/forgejo](https://codeberg.org/forgejo/forgejo/src/branch/v1.18/forgejo) CI https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/678 - [x] publish for testing at https://codeberg.org/forgejo-experimental/ under v1.18.5-0 - [x] force-push v1.18/forgejo branch to forgejo-integration - [x] push tag to forgejo-integration to start build https://ci.dachary.org/forgejo-integration/forgejo/pipeline/127 - [x] force-push v1.18/forgejo branch to https://codeberg.org/forgejo-experimental/forgejo - [x] delete existing tag v1.18.5-0 from https://codeberg.org/forgejo-experimental/forgejo if it exists - [x] force-push v1.18/forgejo branch to https://codeberg.org/forgejo/experimental - [x] push tag to https://codeberg.org/forgejo/experimental https://ci.dachary.org/forgejo/experimental/pipeline/33 - [x] end-to-end testing https://ci.dachary.org/dachary/scripted-configuration/pipeline/130 - `git clone -b wip-lxc https://codeberg.org/earl-warren/scripted-configuration/` - change hosts/forgejo-ci/tests/inside_test.sh to `: ${FORGEJO_IMAGE:=codeberg.org/forgejo-experimental/forgejo}` - [x] prepare release notes https://codeberg.org/forgejo/forgejo/pulls/422 - Gitea changes - Alpine changes for [git](https://pkgs.alpinelinux.org/packages?name=git&branch=v3.16), [gnupg](https://pkgs.alpinelinux.org/packages?name=gnupg&branch=v3.16), [sqlite](https://pkgs.alpinelinux.org/packages?name=sqlite&branch=v3.16), [openssh](https://pkgs.alpinelinux.org/packages?name=openssh&branch=v3.16) - [x] release 1.18.5-0 by pushing the tag to https://codeberg.org/forgejo/release/ (**not** with the web interface) https://ci.dachary.org/forgejo/release/pipeline/9 - [x] publish the release notes by merging the forgejo-development branch into the forgejo branch - [x] publish blog post https://codeberg.org/forgejo/website/pulls/111 - [ ] ~~rebuild main on https://codeberg.org/Forgejo/website~~ (there is no need because the blog post being published will do that) - [x] publish and pin toot https://floss.social/@forgejo/109915906721420383 ``` #Forgejo v1.18.5-0 was just released! This is a security release. We strongly recommend that all installations are upgraded to the latest version as soon as possible. Check out the release notes and download it at https://forgejo.org/releases/. If you experience any issues with this release, please report to https://codeberg.org/forgejo/forgejo/issues. ``` - [x] DNS update via OVH - [x] close the milestone

dachary added this to the Forgejo v1.18.5-0 milestone

dachary added the

forgejo/release

label

dachary self-assigned this

dachary changed title from ~~[RELEASE] Forgejo v1.18.3-3~~ to [RELEASE] Forgejo v1.18.4-0

dachary referenced this issue

Gitea Rebase 20/02/2023 #395

dachary changed title from ~~[RELEASE] Forgejo v1.18.4-0~~ to [RELEASE] Forgejo v1.18.5-0

dachary referenced this issue

Skip Hide 2FA status from other members in organization members list #421

dachary closed this issue