forgejo/forgejo
forgejo/forgejo
60
1.5k
Fork 226
Code Issues 628 Pull requests 49 Releases 49 Packages Activity Actions 1

[WORKFLOW] sync Forgejo with Gitea #51

New issue
Closed
opened 2022-11-26 00:33:20 +00:00 by dachary · 31 comments
dachary commented 2022-11-26 00:33:20 +00:00
Member
Copy link

Tracking the weekly sync with Gitea main and Gitea stable releases, as described in the workflow.

The person assigned to the issue is responsible for carrying out the required actions and documenting any problem and their resolution in this issue.

Tracking the weekly sync with Gitea main and Gitea stable releases, [as described in the workflow](https://codeberg.org/forgejo/forgejo/src/branch/forgejo-development/CONTRIBUTING/WORKFLOW.md#development-workflow). The person assigned to the issue is responsible for carrying out the required actions and documenting any problem and their resolution in this issue.
dachary self-assigned this 2022-11-26 00:33:20 +00:00
dachary changed title from [WORKFLOW] sync Forgeo with Gitea to [WORKFLOW] sync Forgejo with Gitea 2022-11-26 00:33:32 +00:00
dachary commented 2022-11-26 00:47:39 +00:00
Author
Member
Copy link

First rebase on top of Gitea main at eec1c71880

First rebase on top of Gitea main at https://codeberg.org/forgejo/forgejo/commit/eec1c718806797b21ba5f6c1ceddf711e9d4801a
dachary added the due date 2022-12-03 2022-11-28 08:10:07 +00:00
dachary commented 2022-12-03 11:57:54 +00:00
Author
Member
Copy link

Gitea main

there has been 26 commits in Gitea since last week

Gitea v1.18

there has been 6 commits in Gitea since last week

### Gitea main there has been 26 commits in Gitea since last week * https://codeberg.org/forgejo/forgejo/src/branch/forgejo-ci at https://codeberg.org/forgejo/forgejo/commit/e0c205082d9f2ea1375131a1af4f6ee2b39d249a * upgrade to alpine 3.17 https://codeberg.org/forgejo/forgejo/commit/9a69ea5d2d5727fac527ae209b23296289ee6038 * https://codeberg.org/forgejo/forgejo/src/branch/forgejo-development && `git reset --hard https://codeberg.org/forgejo/forgejo/src/branch/forgejo-ci` and `git cherry-pick a99deecbcd4c4ec3eebf2560499f59dcab478b6b..a21a8d18631f6363dfd1188f68367a4ad56a42fd` (i.e. commits from the former forgejo-development branch) * merged in https://codeberg.org/forgejo/forgejo/src/branch/forgejo * https://codeberg.org/forgejo/forgejo/src/branch/forgejo-development * the other branches do not yet pass CI and are not merged ### Gitea v1.18 there has been 6 commits in Gitea since last week * https://codeberg.org/forgejo/forgejo/src/branch/v1.18/forgejo-ci & v1.18/forgejo-integration & v1.18/forgejo at fdb5b89b7f7533db6c9098f130f27e79edc8f7cd
dachary modified the due date from 2022-12-03 to 2022-12-10 2022-12-03 13:25:57 +00:00
caesar commented 2022-12-03 18:36:04 +00:00
Member
Copy link

@dachary it looks like a couple of commits were lost in this process, including 44903a5b8c and 4c98c3c324

Did you forget to pull before rebasing?

@dachary it looks like a couple of commits were lost in this process, including https://codeberg.org/forgejo/forgejo/commit/44903a5b8c2930acf377c5cf381e3e6e42f0a2d0 and https://codeberg.org/forgejo/forgejo/commit/4c98c3c32410bd0dc7042c74686dc138f1c4194d Did you forget to pull before rebasing?
caesar commented 2022-12-03 18:46:16 +00:00
Member
Copy link

@dachary it looks like a couple of commits were lost in this process, including 44903a5b8c and 4c98c3c324

Did you forget to pull before rebasing?

I've cherry-picked those two commits onto forgeo-development, I hope that's okay.

> @dachary it looks like a couple of commits were lost in this process, including https://codeberg.org/forgejo/forgejo/commit/44903a5b8c2930acf377c5cf381e3e6e42f0a2d0 and https://codeberg.org/forgejo/forgejo/commit/4c98c3c32410bd0dc7042c74686dc138f1c4194d > > Did you forget to pull before rebasing? I've cherry-picked those two commits onto `forgeo-development`, I hope that's okay.
dachary commented 2022-12-03 23:51:52 +00:00
Author
Member
Copy link

@dachary it looks like a couple of commits were lost in this process, including 44903a5b8c and 4c98c3c324

Did you forget to pull before rebasing?

Apparently I did.

I've cherry-picked those two commits onto forgeo-development, I hope that's okay.

Absolutely, thank you for fixing my mistake!

> @dachary it looks like a couple of commits were lost in this process, including https://codeberg.org/forgejo/forgejo/commit/44903a5b8c2930acf377c5cf381e3e6e42f0a2d0 and https://codeberg.org/forgejo/forgejo/commit/4c98c3c32410bd0dc7042c74686dc138f1c4194d > > Did you forget to pull before rebasing? Apparently I did. > I've cherry-picked those two commits onto forgeo-development, I hope that's okay. Absolutely, thank you for fixing my mistake!
❤️ 1
dachary commented 2022-12-10 08:46:06 +00:00
Author
Member
Copy link

Archive

The previous branches are prefixed soft-fork/2022-12-10/*

Gitea main

there has been 20 commits in Gitea since last week

Gitea v1.18

there has been 9 commits in Gitea since last week

CI

The runs were done but all over the place because of #35

### Archive The previous branches are prefixed `soft-fork/2022-12-10/*` ### Gitea main there has been 20 commits in Gitea since last week ### Gitea v1.18 there has been 9 commits in Gitea since last week ### CI The runs were done but all over the place because of https://codeberg.org/forgejo/forgejo/issues/35
dachary modified the due date from 2022-12-10 to 2022-12-17 2022-12-11 22:32:58 +00:00
dachary commented 2022-12-17 00:13:30 +00:00
Author
Member
Copy link

Archive

The previous branches are prefixed soft-fork/2022-12-17/*

PRs

#110 base moved to soft-fork/2022-12-17/forgejo-development

Gitea main & stable

push Gitea main, release/v1.18, release/v1.17 in forgejo

forgejo-ci

forgejo-development

forgejo

v1.18/forgejo-ci & v1.18/forgejo

  • cherry-pick commits from forgejo-ci and resolve conflict on Dockerfile because of the maintener name change that is close to the alpine version (3.17 in main, 3.16 in v1.18)
  • force push to v1.18/forgejo-ci
  • ✅ tag run https://forgejo-woodpecker.gna.org/dachary/forgejo/pipeline/120
  • force push v1.18/forgejo-ci to v1.18/forgejo since there is no difference at the moment
### Archive The previous branches are prefixed `soft-fork/2022-12-17/*` ### PRs https://codeberg.org/forgejo/forgejo/pulls/110 base moved to `soft-fork/2022-12-17/forgejo-development` ### Gitea main & stable push Gitea main, release/v1.18, release/v1.17 in forgejo ### forgejo-ci * rebase against gitea/main * squashed the woodpecker configuration into a single commit to facilitate backporting to `v1.18/forgejo-ci` * force push to forgejo-ci * ✅ branch run https://forgejo-woodpecker.gna.org/forgejo/forgejo/pipeline/32 ### forgejo-development * squashed all commits in four that (i) delete old files, (ii) add CONTRIBUTING, (iii) add .gitea, (iv) add README * cherry picked those commits on top of `forgejo-ci` * force push to `forgejo-development` * ✅ branch run https://forgejo-woodpecker.gna.org/forgejo/forgejo/pipeline/36 ### forgejo * force push `forgejo-development` to `forgejo` * ✅ branch run https://forgejo-woodpecker.gna.org/forgejo/forgejo/pipeline/37 ### v1.18/forgejo-ci & v1.18/forgejo * cherry-pick commits from `forgejo-ci` and resolve conflict on Dockerfile because of the maintener name change that is close to the alpine version (3.17 in main, 3.16 in v1.18) * force push to v1.18/forgejo-ci * ✅ tag run https://forgejo-woodpecker.gna.org/dachary/forgejo/pipeline/120 * force push v1.18/forgejo-ci to v1.18/forgejo since there is no difference at the moment
👍 1
dachary modified the due date from 2022-12-17 to 2022-12-24 2022-12-19 21:53:42 +00:00
dachary commented 2022-12-24 08:48:51 +00:00
Author
Member
Copy link

Archive

The previous branches are prefixed soft-fork/2022-12-24/*

PRs

#148 base moved to soft-fork/2022-12-24/forgejo-development

Gitea main & stable

push Gitea main, release/v1.18, release/v1.17 in forgejo

forgejo-ci

forgejo-development

  • squashed all commits in four that (i) delete old files, (ii) add CONTRIBUTING, (iii) add .gitea, (iv) add README
  • cherry picked those commits on top of forgejo-ci
  • force push to forgejo-development

forgejo-branding

forgejo-privacy

forgejo-i18n

forgejo

v1.18/forgejo-ci

v1.18/forgejo-branding

v1.18/forgejo-privacy

v1.18/forgejo-i18n

v1.18/forgejo

image

### Archive The previous branches are prefixed `soft-fork/2022-12-24/*` ### PRs https://codeberg.org/forgejo/forgejo/pulls/148 base moved to `soft-fork/2022-12-24/forgejo-development` ### Gitea main & stable push Gitea main, release/v1.18, release/v1.17 in forgejo ### forgejo-ci * rebase against gitea/main * squashed the woodpecker configuration into a single commit to facilitate backporting to `v1.18/forgejo-ci` * force push to forgejo-ci * ✅ branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/60 * ✅ tag run https://ci.dachary.org/dachary/forgejo/pipeline/14 ### forgejo-development * squashed all commits in four that (i) delete old files, (ii) add CONTRIBUTING, (iii) add .gitea, (iv) add README * cherry picked those commits on top of `forgejo-ci` * force push to `forgejo-development` ### forgejo-branding * cherry picked commits on top of `forgejo-development` * force push to `forgejo-branding` * ✅ branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/63 ### forgejo-privacy * cherry picked commits on top of `forgejo-development` * force push to `forgejo-privacy` * ✅ branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/62 ### forgejo-i18n * cherry picked commits on top of `forgejo-development` * squash all commits updating `build/merge-forgejo-locales.go` * force push to `forgejo-i18n` * ✅ branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/64 ### forgejo * merge `forgejo-{privacy,i18n,branding}` into `forgejo` * force push to `forgejo` * ✅ branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/65 ### v1.18/forgejo-ci * cherry-pick commits from `forgejo-ci` and resolve conflict on Dockerfile because of the maintener name change that is close to the alpine version (3.17 in main, 3.16 in v1.18) * force push to v1.18/forgejo-ci * ✅ branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/69 * ✅ tag run https://ci.dachary.org/dachary/forgejo/pipeline/15 ### v1.18/forgejo-branding * cherry picked `forgejo-branding` commits on top of `v1.18/forgejo-ci` * force push to `v1.18/forgejo-branding` * ✅ branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/70 ### v1.18/forgejo-privacy * cherry picked `forgejo-privacy` commits on top of `v1.18/forgejo-ci` * force push to `v1.18/forgejo-privacy` * ✅ branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/80 (transient failure https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/79 https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/76 https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/74) ### v1.18/forgejo-i18n * cherry picked `forgejo-i18n` commits on top of `v1.18/forgejo-ci` * force push to `v1.18/forgejo-i18n` * ✅ branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/71 ### v1.18/forgejo * merge `v1.18/forgejo-{privacy,i18n,branding}` into `v1.18/forgejo` * force push to `v1.18/forgejo` * ✅ branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/78 (transient failure: https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/77 https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/75 https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/73) * ✅ tag run https://ci.dachary.org/dachary/forgejo/pipeline/16 ![image](/attachments/7b5bb8ec-950c-42db-9016-df5ece5d4df5)
image.png
92 KiB
dachary modified the due date from 2022-12-24 to 2022-12-31 2022-12-24 14:07:51 +00:00
dachary modified the due date from 2022-12-31 to 2023-01-02 2023-01-01 17:57:53 +00:00
dachary commented 2023-01-01 17:59:27 +00:00
Author
Member
Copy link

Shifting this to tomorrow because it feels like #188 should really be ready to make a more robust release cycle.

Shifting this to tomorrow because it feels like https://codeberg.org/forgejo/forgejo/pulls/188 should really be ready to make a more robust release cycle.
dachary commented 2023-01-02 17:27:38 +00:00
Author
Member
Copy link

Shift this to tomorrow because #188 required more work than anticipated.

Shift this to tomorrow because #188 required more work than anticipated.
dachary modified the due date from 2023-01-02 to 2023-01-03 2023-01-02 17:27:56 +00:00
dachary commented 2023-01-02 19:53:37 +00:00
Author
Member
Copy link

Archive

The previous branches are prefixed soft-fork/2023-01-03/*

PRs

Provide detailed instructions to explain how to cherry pick

Gitea main & stable

push Gitea main, release/v1.18 in forgejo

forgejo-ci

forgejo-development

  • squashed all commits in four that (i) delete old files, (ii) add CONTRIBUTING, (iii) add .gitea, (iv) add README
  • cherry picked those commits on top of forgejo-ci
  • force push to forgejo-development

forgejo-branding

forgejo-privacy

forgejo-i18n

forgejo

v1.18/forgejo-ci

v1.18/forgejo-branding

v1.18/forgejo-privacy

v1.18/forgejo-i18n

v1.18/forgejo

### Archive The previous branches are prefixed `soft-fork/2023-01-03/*` ### PRs Provide detailed instructions to explain how to cherry pick * https://codeberg.org/forgejo/forgejo/pulls/198#issuecomment-756711 * https://codeberg.org/forgejo/forgejo/pulls/203#issuecomment-756714 ### Gitea main & stable push Gitea main, release/v1.18 in forgejo ### forgejo-ci * rebase against gitea/main * squashed the woodpecker configuration into a single commit to facilitate backporting to `v1.18/forgejo-ci` * force push to forgejo-ci * ✅ branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/216 ### forgejo-development * squashed all commits in four that (i) delete old files, (ii) add CONTRIBUTING, (iii) add .gitea, (iv) add README * cherry picked those commits on top of `forgejo-ci` * force push to `forgejo-development` ### forgejo-branding * cherry picked commits on top of `forgejo-development` * force push to `forgejo-branding` * ✅ branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/217 ### forgejo-privacy * cherry picked commits on top of `forgejo-development` * force push to `forgejo-privacy` * ✅ branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/218 ### forgejo-i18n * cherry picked commits on top of `forgejo-development` * force push to `forgejo-i18n` * ✅ branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/219 ### forgejo * merge `forgejo-{privacy,i18n,branding}` into `forgejo` * force push to `forgejo` * ✅ branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/220 ### v1.18/forgejo-ci * cherry-pick commits from `forgejo-ci` and resolve conflict on Dockerfile because of the maintener name change that is close to the alpine version (3.17 in main, 3.16 in v1.18) * force push to v1.18/forgejo-ci * ✅ branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/224 ### v1.18/forgejo-branding * cherry picked `forgejo-branding` commits on top of `v1.18/forgejo-ci` * force push to `v1.18/forgejo-branding` * ✅ branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/232 (transient error https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/227) ### v1.18/forgejo-privacy * cherry picked `forgejo-privacy` commits on top of `v1.18/forgejo-ci` * force push to `v1.18/forgejo-privacy` * ✅ branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/231 (transient error https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/226) ### v1.18/forgejo-i18n * cherry picked `forgejo-i18n` commits on top of `v1.18/forgejo-ci` * force push to `v1.18/forgejo-i18n` * ✅ branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/230 (transient error https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/225) ### v1.18/forgejo * merge `v1.18/forgejo-{privacy,i18n,branding}` into `v1.18/forgejo` * force push to `v1.18/forgejo` * ✅ branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/228 * tag run v1.18.0-2 on forgejo-integration * ✅ container images https://ci.dachary.org/forgejo-integration/forgejo/pipeline/57 (stuck https://ci.dachary.org/forgejo-integration/forgejo/pipeline/56 https://ci.dachary.org/forgejo-integration/forgejo/pipeline/55) * ✅ binaries https://ci.dachary.org/forgejo-integration/forgejo/pipeline/58 * tag run v1.18.0-2 on forgejo/experimental * ✅ container images https://ci.dachary.org/forgejo/experimental/pipeline/7 * ✅ binaries https://ci.dachary.org/forgejo/experimental/pipeline/9 (transient error https://ci.dachary.org/forgejo/experimental/pipeline/8)
caesar commented 2023-01-03 08:20:28 +00:00
Member
Copy link

@dachary out of curiosity, how long does it take you each time to do the weekly rebase?

Would it be possible to automate most of this work, or is it quick enough not to be worthwhile?

@dachary out of curiosity, how long does it take you each time to do the weekly rebase? Would it be possible to automate most of this work, or is it quick enough not to be worthwhile?
dachary commented 2023-01-03 09:05:20 +00:00
Author
Member
Copy link

It's taking me a lot of time for a lot of different reasons. The sync itself is around one hour of manual work total, which is not much.

But I spent dozens of hours working on the context to make that possible (the CI being the most time consuming) as well as the tiny details (method and rationale for archiving the branches under soft-fork/* for instance).

As you can see from the logs, last week rebase involved a lot of tag builds and this is no longer the case. Also this time around I worked on how to communicate the cherry-pick with people who have open pull requests: it went better than I expected but there were bumps.

I tend to manually do things and document them as much as humanly possible before writing tools, specially in the early days. Once the manual process repeats a few times and seems sound, I'll write tools to automate the most tedious / error prone parts.

My main concern is to figure out how comfortable people are working on top of feature branches that need rebasing. My hope is that it will feel like working on any other Free Software project most of the time. I think we are yet to discover friction points and it is possible that reducing/removing these friction points will require adopting a different rebasing workflow than what I'm currently doing. It will be easier to do that if there is no tooling at all. If there is tooling, there is also going to be some resistance to change because of the working committed to write and test these tools.

I'm rambling a little but hopefully you get why and how I'm approaching this 😄

It's taking me a lot of time for a lot of different reasons. The sync itself is around one hour of manual work total, which is not much. But I spent dozens of hours working on the context to make that possible (the CI being the most time consuming) as well as the tiny details (method and rationale for archiving the branches under soft-fork/* for instance). As you can see from the logs, last week rebase involved a lot of tag builds and this is no longer the case. Also this time around I worked on how to communicate the cherry-pick with people who have open pull requests: it went better than I expected but there were bumps. I tend to manually do things and document them as much as humanly possible before writing tools, specially in the early days. Once the manual process repeats a few times and seems sound, I'll write tools to automate the most tedious / error prone parts. My main concern is to figure out how comfortable people are working on top of feature branches that need rebasing. My hope is that it will feel like working on any other Free Software project most of the time. I think we are yet to discover friction points and it is possible that reducing/removing these friction points will require adopting a different rebasing workflow than what I'm currently doing. It will be easier to do that if there is no tooling at all. If there is tooling, there is also going to be some resistance to change because of the working committed to write and test these tools. I'm rambling a little but hopefully you get why and how I'm approaching this :smile:
👍 1
caesar commented 2023-01-03 09:27:26 +00:00
Member
Copy link

Thanks for the detailed answer. It seems like more work than I would initially have assumed, but roughly what I had come to understand after seeing it done a few times.

I tend to manually do things and document them as much as humanly possible before writing tools, specially in the early days. Once the manual process repeats a few times and seems sound, I'll write tools to automate the most tedious / error prone parts.

Very wise, this makes a lot of sense.

this time around I worked on how to communicate the cherry-pick with people who have open pull requests: it went better than I expected but there were bumps.

Yes, I saw that. It's a pity we have to put that extra burden on contributors, but I don't have any better ideas. It would be great if we could clearly and simply document that workflow somewhere, to make it as easy as possible.

Similarly, we should document the easiest way for people to keep all their forgejo-* branches up to date after each rebase, since git pull doesn't work.

You suggested:

git reset --hard 7dd926454e # tip of forgejo-branding

I normally do this:

git update-ref refs/heads/forgejo-branding refs/remotes/origin/forgejo-branding

and the same for each forgejo-* branch. This has the advantage of not needing to check out each branch. I was actually thinking of writing a quick shell script to iterate over the branches doing it for me.
(I'm not a git expert so there may be a disadvantage to this technique that I'm not aware of.)

My main concern is to figure out how comfortable people are working on top of feature branches that need rebasing. My hope is that it will feel like working on any other Free Software project most of the time.

I think the problem is that effectively all PRs become stale after every rebase, and the process to refresh them (cherry-picking) is something most people are not familiar with. But I don't have a better solution, other than documenting it as simply as possible.

I'm rambling a little but hopefully you get why and how I'm approaching this 😄

Definitely, thanks!

Thanks for the detailed answer. It seems like more work than I would initially have assumed, but roughly what I had come to understand after seeing it done a few times. > I tend to manually do things and document them as much as humanly possible before writing tools, specially in the early days. Once the manual process repeats a few times and seems sound, I'll write tools to automate the most tedious / error prone parts. Very wise, this makes a lot of sense. > this time around I worked on how to communicate the cherry-pick with people who have open pull requests: it went better than I expected but there were bumps. Yes, I saw that. It's a pity we have to put that extra burden on contributors, but I don't have any better ideas. It would be great if we could clearly and simply document that workflow somewhere, to make it as easy as possible. Similarly, we should document the easiest way for people to keep all their `forgejo-*` branches up to date after each rebase, since `git pull` doesn't work. You suggested: ```sh git reset --hard 7dd926454e # tip of forgejo-branding ``` I normally do this: ```sh git update-ref refs/heads/forgejo-branding refs/remotes/origin/forgejo-branding ``` and the same for each `forgejo-*` branch. This has the advantage of not needing to check out each branch. I was actually thinking of writing a quick shell script to iterate over the branches doing it for me. (I'm not a git expert so there may be a disadvantage to this technique that I'm not aware of.) > My main concern is to figure out how comfortable people are working on top of feature branches that need rebasing. My hope is that it will feel like working on any other Free Software project most of the time. I think the problem is that effectively all PRs become stale after every rebase, and the process to refresh them (cherry-picking) is something most people are not familiar with. But I don't have a better solution, other than documenting it as simply as possible. > I'm rambling a little but hopefully you get why and how I'm approaching this 😄 Definitely, thanks!
fsologureng commented 2023-01-03 16:09:34 +00:00
Contributor
Copy link

Definitely, thanks!

I must second this thank you, your work in forgejo is fundamental and has given me a lot of knowledge and good practices.

>Definitely, thanks! I must second this thank you, your work in forgejo is fundamental and has given me a lot of knowledge and good practices.
❤️ 1
dachary modified the due date from 2023-01-03 to 2023-01-07 2023-01-06 15:24:45 +00:00
dachary modified the due date from 2023-01-07 to 2023-01-10 2023-01-10 08:05:35 +00:00
dachary commented 2023-01-10 08:09:00 +00:00
Author
Member
Copy link

Archive

The current branches are archived using main.sh archive_branches.
The branch archives from soft-fork/2022-12-10 and soft-fork/2022-12-17 are removed to not clutter the list of branches.

PRs

Provide detailed instructions to explain how to cherry pick

Gitea main & stable

push Gitea main, release/v1.18 in forgejo

forgejo-ci

forgejo-development

  • squashed all commits into (i) delete old files, (ii) add CONTRIBUTING, (iii) add .gitea, (iv) add README, (v) update LICENSE
  • cherry picked those commits on top of forgejo-ci
  • force push to forgejo-development

forgejo-branding

forgejo-privacy

forgejo-i18n

  • cherry picked commits on top of forgejo-development
  • squash updates to build/merge-forgejo-locales.go into a single commit
  • prefix all commit messages with [I18N]
  • move branding modification to routers/install/install.go out to forgejo-branding
  • force push to forgejo-i18n
  • ✅: branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/269

forgejo

v1.18/forgejo-ci

v1.18/forgejo-development

v1.18/forgejo-branding

v1.18/forgejo-privacy

v1.18/forgejo-i18n

v1.18/forgejo

### Archive The current branches are archived using [main.sh archive_branches](https://codeberg.org/forgejo-contrib/soft-fork-tools). The branch archives from `soft-fork/2022-12-10` and `soft-fork/2022-12-17` are removed to not clutter the list of branches. ### PRs Provide detailed instructions to explain how to cherry pick * https://codeberg.org/forgejo/forgejo/pulls/198 ### Gitea main & stable push Gitea main, release/v1.18 in forgejo ### forgejo-ci * rebase against gitea/main * squashed the woodpecker configuration into a single commit to facilitate backporting to `v1.18/forgejo-ci` * force push to forgejo-ci * ✅ branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/260 ### forgejo-development * squashed all commits into (i) delete old files, (ii) add CONTRIBUTING, (iii) add .gitea, (iv) add README, (v) update LICENSE * cherry picked those commits on top of `forgejo-ci` * force push to `forgejo-development` ### forgejo-branding * cherry picked commits on top of `forgejo-development` * force push to `forgejo-branding` * ✅ branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/267 ### forgejo-privacy * cherry picked commits on top of `forgejo-development` * force push to `forgejo-privacy` * prefix all commit messages with [PRIVACY] * ✅ branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/268 ### forgejo-i18n * cherry picked commits on top of `forgejo-development` * squash updates to build/merge-forgejo-locales.go into a single commit * prefix all commit messages with [I18N] * move branding modification to routers/install/install.go out to `forgejo-branding` * force push to `forgejo-i18n` * ✅: branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/269 ### forgejo * merge `forgejo-{privacy,i18n,branding}` into `forgejo` * force push to `forgejo` * ✅ branch run https://forgejo-ci.codeberg.org/forgejo/forgejo (transient failure https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/272) ### v1.18/forgejo-ci * cherry-pick commits from `forgejo-ci` and resolve conflict on Dockerfile because of the maintener name change that is close to the alpine version (3.17 in main, 3.16 in v1.18) * force push to v1.18/forgejo-ci * ✅ branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/266 ### v1.18/forgejo-development * cherry picked `forgejo-development` commits on top of `v1.18/forgejo-ci` * force push to `v1.18/forgejo-development` * ✅ branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/270 ### v1.18/forgejo-branding * cherry picked `forgejo-branding` commits on top of `v1.18/forgejo-development` * force push to `v1.18/forgejo-branding` * ✅ branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/271 ### v1.18/forgejo-privacy * cherry picked `forgejo-privacy` commits on top of `v1.18/forgejo-development` * force push to `v1.18/forgejo-privacy` * ✅ branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/274 ### v1.18/forgejo-i18n * cherry picked `forgejo-i18n` commits on top of `v1.18/forgejo-development` * force push to `v1.18/forgejo-i18n` * ✅ branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/273 ### v1.18/forgejo * merge `v1.18/forgejo-{privacy,i18n,branding}` into `v1.18/forgejo` * force push to `v1.18/forgejo` * ✅ branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/275 * tag run v1.18.0-2 on forgejo-integration * ✅ container images https://ci.dachary.org/forgejo-integration/forgejo/pipeline/60 * ✅ binaries https://ci.dachary.org/forgejo-integration/forgejo/pipeline/61 * tag run v1.18.0-2 on forgejo/experimental * ✅ container images https://ci.dachary.org/forgejo/experimental/pipeline/10 * ✅ binaries https://ci.dachary.org/forgejo/experimental/pipeline/11 * ✅ PR run on https://codeberg.org/Codeberg-Infrastructure/scripted-configuration/ with v1.18.0-2 https://woodpecker-local.forgejo.org/dachary/scripted-configuration/pipeline/44
👀 1 ❤️ 1
dachary commented 2023-01-10 17:41:24 +00:00
Author
Member
Copy link

@caesar with this rebase the forgejo-i18n feature branch had a some commits squashed which helps for maintenance. Instead of cherry-picking an ever growing list of commits, these are neatly organized chronological commits that tell a kind of story. Should a conflict occur, it will be easier to deal with.

I refrained from doing the same with the forgejo-branding branch since you're actively working on it and I don't know how much you rely on its full history. Would you like to do something similar?

@caesar with this rebase the `forgejo-i18n` feature branch had a some commits squashed which helps for maintenance. Instead of cherry-picking an ever growing list of commits, these are neatly organized chronological commits that tell a kind of story. Should a conflict occur, it will be easier to deal with. I refrained from doing the same with the `forgejo-branding` branch since you're actively working on it and I don't know how much you rely on its full history. Would you like to do something similar?
dachary modified the due date from 2023-01-10 to 2023-01-17 2023-01-10 19:39:59 +00:00
caesar commented 2023-01-11 07:14:28 +00:00
Member
Copy link

@caesar with this rebase the forgejo-i18n feature branch had a some commits squashed which helps for maintenance. Instead of cherry-picking an ever growing list of commits, these are neatly organized chronological commits that tell a kind of story. Should a conflict occur, it will be easier to deal with.

@dachary I can see the logic behind doing this, but I also worry about hiding authorship information: is it fair to contributors if we strip their attribution from the commit history (by squashing commits from multiple authors into one) for the sake of tidiness / an easier workflow? I don't know the answer, I can see arguments both ways; it just made me a bit uncomfortable.

Maybe we could at least add a Co-authored-by trailer to the commit message for each author whose commits are squashed into a single one?
GitHub displays the information from that commit trailer in the UI. I'm not sure if Forgejo does; if not, it should.

I refrained from doing the same with the forgejo-branding branch since you're actively working on it and I don't know how much you rely on its full history. Would you like to do something similar?

To be honest I'm not really actively working on it right now so it wouldn't be a problem, but thanks for thinking of me.
Since I've done a lot of the work in that branch though, I'm happy to be the one who goes through and squashes what makes sense.

What's the best way for me to do that while fitting in with your workflow? I guess i shouldn't force-push to that branch now you've already merged it into forgejo, or would it not be a problem?

> @caesar with this rebase the `forgejo-i18n` feature branch had a some commits squashed which helps for maintenance. Instead of cherry-picking an ever growing list of commits, these are neatly organized chronological commits that tell a kind of story. Should a conflict occur, it will be easier to deal with. @dachary I can see the logic behind doing this, but I also worry about hiding authorship information: is it fair to contributors if we strip their attribution from the commit history (by squashing commits from multiple authors into one) for the sake of tidiness / an easier workflow? I don't know the answer, I can see arguments both ways; it just made me a bit uncomfortable. Maybe we could at least add a `Co-authored-by` trailer to the commit message for each author whose commits are squashed into a single one? GitHub displays the information from that commit trailer in the UI. I'm not sure if Forgejo does; if not, it should. > I refrained from doing the same with the `forgejo-branding` branch since you're actively working on it and I don't know how much you rely on its full history. Would you like to do something similar? To be honest I'm not really actively working on it right now so it wouldn't be a problem, but thanks for thinking of me. Since I've done a lot of the work in that branch though, I'm happy to be the one who goes through and squashes what makes sense. What's the best way for me to do that while fitting in with your workflow? I guess i shouldn't force-push to that branch now you've already merged it into `forgejo`, or would it not be a problem?
dachary commented 2023-01-11 07:54:38 +00:00
Author
Member
Copy link

@caesar with this rebase the forgejo-i18n feature branch had a some commits squashed which helps for maintenance. Instead of cherry-picking an ever growing list of commits, these are neatly organized chronological commits that tell a kind of story. Should a conflict occur, it will be easier to deal with.

@dachary I can see the logic behind doing this, but I also worry about hiding authorship information: is it fair to contributors if we strip their attribution from the commit history (by squashing commits from multiple authors into one) for the sake of tidiness / an easier workflow? I don't know the answer, I can see arguments both ways; it just made me a bit uncomfortable.

This is on of the reason for archiving the branches under soft-fork/YYYY-MM-DD/*. Another is forensic analysis if (I should write "when" because accidents happen) a commit gets lost or a regression is introduced in a rebase. It is vitally important to not loose any commit.

As the number of archive branches grow it will cause UI issues (clutter, slowness) and it is likely they will need to be moved to a forgejo-archive repository for safekeeping. But this is something that can be addressed when and if it becomes a problem.

Maybe we could at least add a Co-authored-by trailer to the commit message for each author whose commits are squashed into a single one?

I agree.

GitHub displays the information from that commit trailer in the UI. I'm not sure if Forgejo does; if not, it should.

I think it does something of the kind when a PR is merged, in the merge commit comment.

I refrained from doing the same with the forgejo-branding branch since you're actively working on it and I don't know how much you rely on its full history. Would you like to do something similar?

To be honest I'm not really actively working on it right now so it wouldn't be a problem, but thanks for thinking of me.
Since I've done a lot of the work in that branch though, I'm happy to be the one who goes through and squashes what makes sense.

Great! In your own time though, there is no pressure.

What's the best way for me to do that while fitting in with your workflow? I guess i shouldn't force-push to that branch now you've already merged it into forgejo, or would it not be a problem?

You can force push forgejo-branding and it will be merged into forgejo on the next rebase on top of Gitea. Your changes won't be in the forgejo branch in the meantime. When I rework the commit history of a feature branch I take a look at pending pull requests targeting it because they are going to be impacted.

> > @caesar with this rebase the `forgejo-i18n` feature branch had a some commits squashed which helps for maintenance. Instead of cherry-picking an ever growing list of commits, these are neatly organized chronological commits that tell a kind of story. Should a conflict occur, it will be easier to deal with. > > @dachary I can see the logic behind doing this, but I also worry about hiding authorship information: is it fair to contributors if we strip their attribution from the commit history (by squashing commits from multiple authors into one) for the sake of tidiness / an easier workflow? I don't know the answer, I can see arguments both ways; it just made me a bit uncomfortable. This is on of the reason for archiving the branches under `soft-fork/YYYY-MM-DD/*`. Another is forensic analysis if (I should write "when" because accidents happen) a commit gets lost or a regression is introduced in a rebase. It is vitally important to not loose any commit. As the number of archive branches grow it will cause UI issues (clutter, slowness) and it is likely they will need to be moved to a `forgejo-archive` repository for safekeeping. But this is something that can be addressed when and if it becomes a problem. > Maybe we could at least add a `Co-authored-by` trailer to the commit message for each author whose commits are squashed into a single one? I agree. > GitHub displays the information from that commit trailer in the UI. I'm not sure if Forgejo does; if not, it should. I think it does something of the kind when a PR is merged, in the merge commit comment. > > I refrained from doing the same with the `forgejo-branding` branch since you're actively working on it and I don't know how much you rely on its full history. Would you like to do something similar? > > To be honest I'm not really actively working on it right now so it wouldn't be a problem, but thanks for thinking of me. > Since I've done a lot of the work in that branch though, I'm happy to be the one who goes through and squashes what makes sense. Great! In your own time though, there is no pressure. > What's the best way for me to do that while fitting in with your workflow? I guess i shouldn't force-push to that branch now you've already merged it into `forgejo`, or would it not be a problem? You can force push `forgejo-branding` and it will be merged into `forgejo` on the next rebase on top of Gitea. Your changes won't be in the `forgejo` branch in the meantime. When I rework the commit history of a feature branch I take a look at pending pull requests targeting it because they are going to be impacted.
👍 1
caesar commented 2023-01-11 10:03:02 +00:00
Member
Copy link

Perfect, thanks. I'll do it some time in the next few days.

Perfect, thanks. I'll do it some time in the next few days.
dachary commented 2023-01-17 00:50:04 +00:00
Author
Member
Copy link

Archive

The current branches are archived using main.sh archive_branches.

PRs

Provide detailed instructions to explain how to cherry pick

Gitea main & stable

push Gitea main, release/v1.18 in forgejo

forgejo-ci

forgejo-development

  • squashed all commits into (i) delete old files, (ii) add CONTRIBUTING, (iii) add .gitea, (iv) add README, (v) update LICENSE
  • cherry picked those commits on top of forgejo-ci
  • force push to forgejo-development

forgejo-branding

forgejo-privacy

forgejo-i18n

forgejo

v1.18/forgejo-ci

v1.18/forgejo-development

v1.18/forgejo-branding

  • cherry picked forgejo-branding commits on top of v1.18/forgejo-development
  • conflict resolution:
    • AllowedHeaders: append([]string{"Authorization", "X-Gitea-OTP", "X-Forgejo-OTP"}, setting.CORSConfig.Headers...), was
    • AllowedHeaders: []string{"Authorization", "X-Gitea-OTP", "X-Forgejo-OTP"},
  • conflict resolution: routers/web/web.go web.Bind was bindIgnErr
  • conflict resolution: services/webhook/webhook.go webhook_module was webhook_model
  • conflict resolution: web/repo/webhook.go webhook_module was webhook
  • force push to v1.18/forgejo-branding
  • ✅ branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/350

v1.18/forgejo-privacy

v1.18/forgejo-i18n

v1.18/forgejo

### Archive The current branches are archived using [main.sh archive_branches](https://codeberg.org/forgejo-contrib/soft-fork-tools). ### PRs Provide detailed instructions to explain how to cherry pick * https://codeberg.org/forgejo/forgejo/pulls/250 * https://codeberg.org/forgejo/forgejo/pulls/242 * https://codeberg.org/forgejo/forgejo/pulls/198 ### Gitea main & stable push Gitea main, release/v1.18 in forgejo ### forgejo-ci * rebase against gitea/main * resolve conflict because of the addition of freebsd * force push to forgejo-ci * :white_check_mark: branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/320 ### forgejo-development * squashed all commits into (i) delete old files, (ii) add CONTRIBUTING, (iii) add .gitea, (iv) add README, (v) update LICENSE * cherry picked those commits on top of `forgejo-ci` * force push to `forgejo-development` ### forgejo-branding * cherry picked commits on top of `forgejo-development` * force push to `forgejo-branding` * :white_check_mark: branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/321 ### forgejo-privacy * cherry picked commits on top of `forgejo-development` * force push to `forgejo-privacy` * prefix all commit messages with [PRIVACY] * :white_check_mark: branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/322 ### forgejo-i18n * cherry picked commits on top of `forgejo-development` * squash updates to build/merge-forgejo-locales.go into a single commit * force push to `forgejo-i18n` * :white_check_mark:: branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/323 ### forgejo * reset to forgejo/main * merge `forgejo-{privacy,i18n,branding}` into `forgejo` * force push to `forgejo` * :white_check_mark: branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/324 ### v1.18/forgejo-ci * cherry-pick the commits on top of the latest release/v1.18 * cherry-pick 40229a7dd8edc0f07fb1982c0912fdf4df083871 Skip GitHub migration tests if the API token is undefined (#21824) * force push to v1.18/forgejo-ci * :white_check_mark: branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/348 ### v1.18/forgejo-development * cherry picked `forgejo-development` commits on top of `v1.18/forgejo-ci` * solve one conflict because CONTRIBUTING.md is not the same in v1.18 but it does not matter since it is deleted * force push to `v1.18/forgejo-development` * :white_check_mark: branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/349 ### v1.18/forgejo-branding * cherry picked `forgejo-branding` commits on top of `v1.18/forgejo-development` * conflict resolution: * `AllowedHeaders: append([]string{"Authorization", "X-Gitea-OTP", "X-Forgejo-OTP"}, setting.CORSConfig.Headers...),` was * `AllowedHeaders: []string{"Authorization", "X-Gitea-OTP", "X-Forgejo-OTP"},` * conflict resolution: routers/web/web.go web.Bind was bindIgnErr * conflict resolution: services/webhook/webhook.go webhook_module was webhook_model * conflict resolution: web/repo/webhook.go webhook_module was webhook * force push to `v1.18/forgejo-branding` * :white_check_mark: branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/350 ### v1.18/forgejo-privacy * cherry picked `forgejo-privacy` commits on top of `v1.18/forgejo-development` * force push to `v1.18/forgejo-privacy` * :white_check_mark: branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/354 ### v1.18/forgejo-i18n * cherry picked `forgejo-i18n` commits on top of `v1.18/forgejo-development` * force push to `v1.18/forgejo-i18n` * :white_check_mark: branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/329 ### v1.18/forgejo * merge `v1.18/forgejo-{privacy,i18n,branding}` into `v1.18/forgejo` * force push to `v1.18/forgejo` * :white_check_mark: branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/371 * tag run v1.18.1-0 on forgejo-integration * :white_check_mark: container images https://ci.dachary.org/forgejo-integration/forgejo/pipeline/72 * :white_check_mark: binaries https://ci.dachary.org/forgejo-integration/forgejo/pipeline/73 * tag run v1.18.1-0 on forgejo/experimental * :white_check_mark: container images https://ci.dachary.org/forgejo/experimental/pipeline/12 * :white_check_mark: binaries https://ci.dachary.org/forgejo/experimental/pipeline/12 * :white_check_mark: run on https://codeberg.org/dachary/scripted-configuration/ with v1.18.1-0 https://woodpecker-local.forgejo.org/dachary/scripted-configuration/pipeline/47
dachary commented 2023-01-17 00:51:27 +00:00
Author
Member
Copy link

I won't work on tooling this time around because 1.18.1-0 should happen soon.

I won't work on tooling this time around because 1.18.1-0 should happen soon.
fsologureng commented 2023-01-17 13:04:00 +00:00
Contributor
Copy link

Thanks @dachary for this.
I have one question about conflicts: I understand that each conflict should be resolved at each branch for futures syncs in order to avoid conflict escalation. I mean, if a function change its name, or change the scope of a modified code, that modification should be updated to fit to the new upstream code to prevent future conflicts in this sync, I am right?
I am not shure if this is obvious or should be documented to avoid confusion.

Thanks @dachary for this. I have one question about conflicts: I understand that each conflict should be resolved at each branch for futures syncs in order to avoid conflict escalation. I mean, if a function change its name, or change the scope of a modified code, that modification should be updated to fit to the new upstream code to prevent future conflicts in this sync, I am right? I am not shure if this is obvious or should be documented to avoid confusion.
dachary commented 2023-01-18 00:17:58 +00:00
Author
Member
Copy link

The rebase and the release are delayed until the Codeberg performance problems are resolved.

The rebase and the release are delayed until the Codeberg performance problems are resolved.
dachary commented 2023-01-18 14:04:19 +00:00
Author
Member
Copy link

The rebase is complete and the release is available in experimental. Codeberg is not back to normal but using git only is a viable workaround for the release process.

The rebase is complete and the release is available in experimental. Codeberg is not back to normal but using git only is a viable workaround for the release process.
👍 1
dachary modified the due date from 2023-01-17 to 2023-01-24 2023-01-22 00:10:50 +00:00
dachary commented 2023-01-27 22:34:59 +00:00
Author
Member
Copy link

Archive

The current branches are archived using main.sh archive_branches.

PRs

Provide detailed instructions to explain how to cherry pick

Gitea main & stable

push Gitea main, release/v1.18 in forgejo

forgejo-ci

forgejo-development

  • squashed all commits into (i) delete old files, (ii) add CONTRIBUTING, (iii) add .gitea, (iv) add README, (v) update LICENSE
  • cherry picked those commits on top of forgejo-ci
  • force push to forgejo-development

forgejo-branding

forgejo-privacy

forgejo-i18n

forgejo

v1.18/forgejo-ci

v1.18/forgejo-development

  • cherry picked forgejo-development commits on top of v1.18/forgejo-ci
  • solve one conflict because CONTRIBUTING.md is not the same in v1.18 but it does not matter since it is deleted
  • force push to v1.18/forgejo-development

v1.18/forgejo-branding

  • cherry picked forgejo-branding commits on top of v1.18/forgejo-development
  • conflict resolution [BRANDING] add X-Forgejo-* headers
    • AllowedHeaders: []string{"Authorization", "X-Gitea-OTP", "X-Forgejo-OTP"},
  • conflict resolution [BRANDING] define the forgejo webhook type
    • routers/web/web.go web.Bind was bindIgnErr
    • services/webhook/webhook.go webhook_module was webhook_model
    • routers/web/repo/webhook.go s/webhook_module/webhook/
    • modules/webhook/type.go was in models/webhook/webhook.go 
      // Types of webhooks
const (
   FORGEJO    HookType = "forgejo"
   GITEA      HookType = "gitea"
  • force push to v1.18/forgejo-branding
  • ✅ branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/418

v1.18/forgejo-privacy

v1.18/forgejo-i18n

v1.18/forgejo

### Archive The current branches are archived using [main.sh archive_branches](https://codeberg.org/forgejo-contrib/soft-fork-tools). ### PRs Provide detailed instructions to explain how to cherry pick * https://codeberg.org/forgejo/forgejo/pulls/242 * https://codeberg.org/forgejo/forgejo/pulls/278 * https://codeberg.org/forgejo/forgejo/pulls/279 * https://codeberg.org/forgejo/forgejo/pulls/280 ### Gitea main & stable push Gitea main, release/v1.18 in forgejo ### forgejo-ci * rebase against gitea/main * squash changes to .woodpecker/* * force push to forgejo-ci * :white_check_mark: branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/406 ### forgejo-development * squashed all commits into (i) delete old files, (ii) add CONTRIBUTING, (iii) add .gitea, (iv) add README, (v) update LICENSE * cherry picked those commits on top of `forgejo-ci` * force push to `forgejo-development` ### forgejo-branding * cherry picked commits on top of `forgejo-development` * [cleanup the commit history](https://codeberg.org/forgejo/forgejo/issues/282) * force push to `forgejo-branding` * :white_check_mark: branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/417 ### forgejo-privacy * cherry picked commits on top of `forgejo-development` * force push to `forgejo-privacy` * prefix all commit messages with [PRIVACY] * :white_check_mark: branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/410 ### forgejo-i18n * cherry picked commits on top of `forgejo-development` * squash updates to build/merge-forgejo-locales.go into a single commit * force push to `forgejo-i18n` * :white_check_mark: branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/411 ### forgejo * reset to forgejo/main * merge `forgejo-{privacy,i18n,branding}` into `forgejo` * force push to `forgejo` * :white_check_mark: branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/419 ### v1.18/forgejo-ci * cherry-pick the commits on top of the latest release/v1.18 * do not cherry pick the commit that removes unstable tests as it does not exist in v1.18 * cherry-pick 40229a7dd8edc0f07fb1982c0912fdf4df083871 Skip GitHub migration tests if the API token is undefined (#21824) * force push to v1.18/forgejo-ci * :white_check_mark: branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/414 ### v1.18/forgejo-development * cherry picked `forgejo-development` commits on top of `v1.18/forgejo-ci` * solve one conflict because CONTRIBUTING.md is not the same in v1.18 but it does not matter since it is deleted * force push to `v1.18/forgejo-development` ### v1.18/forgejo-branding * cherry picked `forgejo-branding` commits on top of `v1.18/forgejo-development` * conflict resolution [BRANDING] add X-Forgejo-* headers * `AllowedHeaders: []string{"Authorization", "X-Gitea-OTP", "X-Forgejo-OTP"},` * conflict resolution [BRANDING] define the forgejo webhook type * routers/web/web.go web.Bind was bindIgnErr * services/webhook/webhook.go webhook_module was webhook_model * routers/web/repo/webhook.go s/webhook_module/webhook/ * modules/webhook/type.go was in models/webhook/webhook.go ``` // Types of webhooks const ( FORGEJO HookType = "forgejo" GITEA HookType = "gitea" ``` * force push to `v1.18/forgejo-branding` * :white_check_mark: branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/418 ### v1.18/forgejo-privacy * cherry picked `forgejo-privacy` commits on top of `v1.18/forgejo-development` * force push to `v1.18/forgejo-privacy` * :white_check_mark: branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/415 ### v1.18/forgejo-i18n * cherry picked `forgejo-i18n` commits on top of `v1.18/forgejo-development` * force push to `v1.18/forgejo-i18n` * :white_check_mark: branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/416 ### v1.18/forgejo * merge `v1.18/forgejo-{privacy,i18n,branding}` into `v1.18/forgejo` * force push to `v1.18/forgejo` * :white_check_mark: branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/420 * tag run v1.18.3-0 on forgejo-integration :white_check_mark: https://ci.dachary.org/forgejo-integration/forgejo/pipeline/83 * tag run v1.18.3-0 on forgejo/experimental :white_check_mark: https://ci.dachary.org/forgejo/experimental/pipeline/17 * :white_check_mark: run on https://codeberg.org/dachary/scripted-configuration/ with v1.18.3-0 https://ci.dachary.org/dachary/scripted-configuration/pipeline/124
dachary modified the due date from 2023-01-24 to 2023-01-27 2023-01-27 22:38:20 +00:00
dachary modified the due date from 2023-01-27 to 2023-01-28 2023-01-27 22:38:29 +00:00
dachary commented 2023-02-04 17:30:09 +00:00
Author
Member
Copy link

Archive

The current branches are archived using main.sh archive_branches.

PRs

Provide detailed instructions to explain how to cherry pick

Gitea main & stable

push Gitea main, release/v1.18 in forgejo

forgejo-ci

forgejo-development

  • squashed all commits into (i) delete old files, (ii) add CONTRIBUTING, (iii) add .gitea, (iv) add README, (v) update LICENSE
  • cherry picked those commits on top of forgejo-ci
  • force push to forgejo-development

forgejo-branding

forgejo-privacy

forgejo-i18n

forgejo

v1.18/forgejo-ci

v1.18/forgejo-development

  • cherry picked forgejo-development commits on top of v1.18/forgejo-ci
  • solve one conflict because CONTRIBUTING.md is not the same in v1.18 but it does not matter since it is deleted
  • force push to v1.18/forgejo-development

v1.18/forgejo-branding

  • cherry picked forgejo-branding commits on top of v1.18/forgejo-development
  • conflict resolution [BRANDING] Rebrand footer "powered by" links
    • trivial context change
  • conflict resolution [BRANDING] add X-Forgejo-* headers
    • AllowedHeaders: []string{"Authorization", "X-Gitea-OTP", "X-Forgejo-OTP"},
  • conflict resolution [BRANDING] define the forgejo webhook type
    • routers/web/web.go web.Bind was bindIgnErr
    • services/webhook/webhook.go webhook_module was webhook_model
    • routers/web/repo/webhook.go s/webhook_module/webhook/
    • modules/webhook/type.go was in models/webhook/webhook.go 
      // Types of webhooks
const (
   FORGEJO    HookType = "forgejo"
   GITEA      HookType = "gitea"
  • force push to v1.18/forgejo-branding
  • ✅ branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/452

v1.18/forgejo-privacy

v1.18/forgejo-i18n

v1.18/forgejo

### Archive The current branches are archived using [main.sh archive_branches](https://codeberg.org/forgejo-contrib/soft-fork-tools). ### PRs Provide detailed instructions to explain how to cherry pick * https://codeberg.org/forgejo/forgejo/pulls/307 * https://codeberg.org/forgejo/forgejo/pulls/314 * https://codeberg.org/forgejo/forgejo/pulls/242 ### Gitea main & stable push Gitea main, release/v1.18 in forgejo ### forgejo-ci * rebase against gitea/main * squash changes to .woodpecker/* * force push to forgejo-ci * :white_check_mark: branch run https://ci.dachary.org/forgejo/forgejo/pipeline/16/6 ### forgejo-development * squashed all commits into (i) delete old files, (ii) add CONTRIBUTING, (iii) add .gitea, (iv) add README, (v) update LICENSE * cherry picked those commits on top of `forgejo-ci` * force push to `forgejo-development` ### forgejo-branding * cherry picked commits on top of `forgejo-development` * [cleanup the commit history](https://codeberg.org/forgejo/forgejo/issues/282) * force push to `forgejo-branding` * :white_check_mark: branch run https://ci.dachary.org/forgejo/forgejo/pipeline/31 ### forgejo-privacy * cherry picked commits on top of `forgejo-development` * force push to `forgejo-privacy` * prefix all commit messages with [PRIVACY] * :white_check_mark: branch run https://ci.dachary.org/forgejo/forgejo/pipeline/27 ### forgejo-i18n * cherry picked commits on top of `forgejo-development` * squash updates to build/merge-forgejo-locales.go into a single commit * force push to `forgejo-i18n` * :white_check_mark: branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/442 ### forgejo * reset to forgejo/main * merge `forgejo-{privacy,i18n,branding}` into `forgejo` * force push to `forgejo` * :white_check_mark: branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/443 ### v1.18/forgejo-ci * cherry-pick the commits on top of the latest release/v1.18 * do not cherry pick the commit that removes unstable tests as it does not exist in v1.18 * cherry-pick 40229a7dd8edc0f07fb1982c0912fdf4df083871 Skip GitHub migration tests if the API token is undefined (#21824) * force push to v1.18/forgejo-ci * :white_check_mark: branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/449 ### v1.18/forgejo-development * cherry picked `forgejo-development` commits on top of `v1.18/forgejo-ci` * solve one conflict because CONTRIBUTING.md is not the same in v1.18 but it does not matter since it is deleted * force push to `v1.18/forgejo-development` ### v1.18/forgejo-branding * cherry picked `forgejo-branding` commits on top of `v1.18/forgejo-development` * conflict resolution [BRANDING] Rebrand footer "powered by" links * trivial context change * conflict resolution [BRANDING] add X-Forgejo-* headers * `AllowedHeaders: []string{"Authorization", "X-Gitea-OTP", "X-Forgejo-OTP"},` * conflict resolution [BRANDING] define the forgejo webhook type * routers/web/web.go web.Bind was bindIgnErr * services/webhook/webhook.go webhook_module was webhook_model * routers/web/repo/webhook.go s/webhook_module/webhook/ * modules/webhook/type.go was in models/webhook/webhook.go ``` // Types of webhooks const ( FORGEJO HookType = "forgejo" GITEA HookType = "gitea" ``` * force push to `v1.18/forgejo-branding` * :white_check_mark: branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/452 ### v1.18/forgejo-privacy * cherry picked `forgejo-privacy` commits on top of `v1.18/forgejo-development` * force push to `v1.18/forgejo-privacy` * :white_check_mark: branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/451 ### v1.18/forgejo-i18n * cherry picked `forgejo-i18n` commits on top of `v1.18/forgejo-development` * force push to `v1.18/forgejo-i18n` * :white_check_mark: branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/450 ### v1.18/forgejo * merge `v1.18/forgejo-{privacy,i18n,branding}` into `v1.18/forgejo` * force push to `v1.18/forgejo` * :white_check_mark: branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/453 * tag run v1.18.3-1 on forgejo-integration :white_check_mark: https://ci.dachary.org/forgejo-integration/forgejo/pipeline/85 * tag run v1.18.3-1 on forgejo/experimental :white_check_mark: https://ci.dachary.org/forgejo/experimental/pipeline/19 * :white_check_mark: run on https://codeberg.org/dachary/scripted-configuration/ with v1.18.3-1 https://ci.dachary.org/dachary/scripted-configuration/pipeline/126
dachary modified the due date from 2023-01-28 to 2023-02-11 2023-02-05 12:13:52 +00:00
dachary commented 2023-02-11 07:13:39 +00:00
Author
Member
Copy link

Archive

The current branches are archived using main.sh archive_branches.

PRs

Provide detailed instructions to explain how to cherry pick

Gitea main & stable

push Gitea main, release/v1.18 in forgejo

test-env

forgejo-ci

forgejo-development

  • reset hard on top of forgejo-ci
  • cherry-pick all commits from the archived forgejo-ci branch
  • squash commits related to existing commits
  • add the [API] Forgejo API /api/forgejo/v1 to the commit history
  • force push to forgejo-development
  • ✅ branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/511

forgejo-branding

forgejo-privacy

forgejo-i18n

forgejo-a11y

forgejo

v1.18/forgejo-ci

v1.18/forgejo-development

  • cherry picked forgejo-development commits on top of v1.18/forgejo-ci
  • Revert "Use import of OCI structs (#22765) (#22805)" #334
  • solve one conflict because CONTRIBUTING.md is not the same in v1.18 but it does not matter since it is deleted
  • conflict resolution [API] Forgejo API /api/forgejo/v1
    • Makefile trivial context conflict
    • routers/init.go trivial context conflict
    • go.mod, go.sum discard changes they are unecessary
  • force push to v1.18/forgejo-development
  • ✅ branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/525

v1.18/forgejo-branding

  • cherry picked forgejo-branding commits on top of v1.18/forgejo-development
  • conflict resolution [BRANDING] Rebrand footer "powered by" links
    • trivial context change
  • conflict resolution [BRANDING] add X-Forgejo-* headers (picked from previous archive branch)
    • AllowedHeaders: []string{"Authorization", "X-Gitea-OTP", "X-Forgejo-OTP"},
  • conflict resolution [BRANDING] define the forgejo webhook type (picked from previous archive branch)
    • routers/web/web.go web.Bind was bindIgnErr
    • services/webhook/webhook.go webhook_module was webhook_model
    • routers/web/repo/webhook.go s/webhook_module/webhook/
    • modules/webhook/type.go was in models/webhook/webhook.go 
      // Types of webhooks
const (
   FORGEJO    HookType = "forgejo"
   GITEA      HookType = "gitea"
  • force push to v1.18/forgejo-branding
  • ✅ branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/534

v1.18/forgejo-privacy

v1.18/forgejo-i18n

v1.18/forgejo-a11y

v1.18/forgejo

### Archive The current branches are archived using [main.sh archive_branches](https://codeberg.org/forgejo-contrib/soft-fork-tools). ### PRs Provide detailed instructions to explain how to cherry pick * https://codeberg.org/forgejo/forgejo/pulls/345 ### Gitea main & stable push Gitea main, release/v1.18 in forgejo ### test-env * update https://codeberg.org/forgejo/test-env/ to match https://gitea.com/gitea/test-env * set the 1.18 branch to match main because v1.18 now is compatible with go 1.20 https://ci.dachary.org/forgejo/test-env/pipeline/5 ### forgejo-ci * rebase on top of gitea/main * squash changes to .woodpecker/* * force push to forgejo-ci * :white_check_mark: branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/508 ### forgejo-development * reset hard on top of `forgejo-ci` * cherry-pick all commits from the archived `forgejo-ci` branch * squash commits related to existing commits * add the [API] Forgejo API /api/forgejo/v1 to the commit history * force push to `forgejo-development` * :white_check_mark: branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/511 ### forgejo-branding * cherry picked commits on top of `forgejo-development` * force push to `forgejo-branding` * :white_check_mark: branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/513 ### forgejo-privacy * cherry picked commits on top of `forgejo-development` * force push to `forgejo-privacy` * :white_check_mark: branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/514 ### forgejo-i18n * cherry picked commits on top of `forgejo-development` * force push to `forgejo-i18n` * :white_check_mark: branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/519 (transient failure https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/512) ### forgejo-a11y * cherry picked commits on top of `forgejo-development` * force push to `forgejo-a11y` * :white_check_mark: branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/515 ### forgejo * reset to forgejo/main * merge `forgejo-{privacy,i18n,branding,a11y}` into `forgejo` * force push to `forgejo` * :white_check_mark: branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/516 ### v1.18/forgejo-ci * cherry-pick the commits on top of the latest release/v1.18 * do not cherry pick the commit that removes unstable tests as it does not exist in v1.18 * cherry-pick ae6474ba9397d9d36d401a58988e4c1dbfce7146 [CI] use test-env:1.18 * cherry-pick 40229a7dd8edc0f07fb1982c0912fdf4df083871 Skip GitHub migration tests if the API token is undefined (#21824) * force push to v1.18/forgejo-ci * :white_check_mark: branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/521 ### v1.18/forgejo-development * cherry picked `forgejo-development` commits on top of `v1.18/forgejo-ci` * Revert "Use import of OCI structs (#22765) (#22805)" https://codeberg.org/forgejo/forgejo/issues/334 * solve one conflict because CONTRIBUTING.md is not the same in v1.18 but it does not matter since it is deleted * conflict resolution [API] Forgejo API /api/forgejo/v1 * Makefile trivial context conflict * routers/init.go trivial context conflict * go.mod, go.sum discard changes they are unecessary * force push to `v1.18/forgejo-development` * :white_check_mark: branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/525 ### v1.18/forgejo-branding * cherry picked `forgejo-branding` commits on top of `v1.18/forgejo-development` * conflict resolution [BRANDING] Rebrand footer "powered by" links * trivial context change * conflict resolution [BRANDING] add X-Forgejo-* headers (picked from previous archive branch) * `AllowedHeaders: []string{"Authorization", "X-Gitea-OTP", "X-Forgejo-OTP"},` * conflict resolution [BRANDING] define the forgejo webhook type (picked from previous archive branch) * routers/web/web.go web.Bind was bindIgnErr * services/webhook/webhook.go webhook_module was webhook_model * routers/web/repo/webhook.go s/webhook_module/webhook/ * modules/webhook/type.go was in models/webhook/webhook.go ``` // Types of webhooks const ( FORGEJO HookType = "forgejo" GITEA HookType = "gitea" ``` * force push to `v1.18/forgejo-branding` * :white_check_mark: branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/534 ### v1.18/forgejo-privacy * cherry picked `forgejo-privacy` commits on top of `v1.18/forgejo-development` * force push to `v1.18/forgejo-privacy` * :white_check_mark: branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/531 ### v1.18/forgejo-i18n * cherry picked `forgejo-i18n` commits on top of `v1.18/forgejo-development` * force push to `v1.18/forgejo-i18n` * :white_check_mark: branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/533 ### v1.18/forgejo-a11y * cherry picked `forgejo-a11y` commits on top of `v1.18/forgejo-development` * force push to `v1.18/forgejo-a11y` * :white_check_mark: branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/532 ### v1.18/forgejo * merge `v1.18/forgejo-{privacy,i18n,branding,a11y}` into `v1.18/forgejo` * force push to `v1.18/forgejo` * :white_check_mark: branch run https://forgejo-ci.codeberg.org/forgejo/forgejo/pipeline/535 * tag run v1.18.3-2 on forgejo-integration :white_check_mark: https://ci.dachary.org/forgejo-integration/forgejo/pipeline/116 * tag run v1.18.3-2 on forgejo/experimental :white_check_mark: https://ci.dachary.org/forgejo/experimental/pipeline/25 * run on https://codeberg.org/dachary/scripted-configuration/ with container v1.18 https://ci.dachary.org/dachary/scripted-configuration/pipeline/128
dachary modified the due date from 2023-02-11 to 2023-02-18 2023-02-11 07:14:40 +00:00
dachary modified the due date from 2023-02-18 to 2023-02-19 2023-02-18 12:06:18 +00:00
dachary modified the due date from 2023-02-19 to 2023-02-20 2023-02-19 22:17:55 +00:00
dachary commented 2023-02-19 22:18:24 +00:00
Author
Member
Copy link

I got busy with other things, therefore postponed one more day.

I got busy with other things, therefore postponed one more day.
dachary commented 2023-02-20 08:27:45 +00:00
Author
Member
Copy link

Archive

The current branches are archived using main.sh archive_branches.

PRs

Provide detailed instructions to explain how to cherry pick

Gitea main & stable

push Gitea main, release/v1.18 in forgejo

test-env

Rebase milestone

Test run of release

### Archive The current branches are archived using [main.sh archive_branches](https://codeberg.org/forgejo-contrib/soft-fork-tools). ### PRs Provide detailed instructions to explain how to cherry pick * https://codeberg.org/forgejo/forgejo/pulls/376 ### Gitea main & stable push Gitea main, release/v1.18 in forgejo ### test-env * update https://codeberg.org/forgejo/test-env/ to match https://gitea.com/gitea/test-env * set the 1.18 branch to match main ### Rebase milestone * Created manually https://codeberg.org/forgejo/forgejo/milestone/3513 * All PRs in the milestone were prepared with [main.sh rebase_*](https://codeberg.org/forgejo-contrib/soft-fork-tools) & manual intervention * Each PR has comments to document the manual actions ### Test run of release * tag run v1.18.4-0 on forgejo-integration :clock1: ??? * tag run v1.18.4-0 on forgejo/experimental :clock1: ??? * run on https://codeberg.org/dachary/scripted-configuration/ with container v1.18 ???
dachary commented 2023-02-20 12:44:19 +00:00
Author
Member
Copy link

Moved the notes to a dedicated issue in the milestone tracking the rebase. This concludes this long standing issue: further rebase will be a set of PR & issues grouped into a milestone.

Moved the notes to [a dedicated issue](https://codeberg.org/forgejo/forgejo/issues/395) in the milestone tracking the rebase. This concludes this long standing issue: further rebase will be a set of PR & issues grouped into a milestone.
👍 1
dachary removed the due date 2023-02-20 2023-02-20 12:44:35 +00:00
Sign in to join this conversation.
No Branch/Tag specified
Branches Tags
forgejo
renovate/forgejo-golang.org-x-net-0.x
renovate/forgejo-golang.org-x-image-0.x
renovate/forgejo-golang.org-x-crypto-0.x
renovate/forgejo-tailwindcss-3.x
v8.0/forgejo
v7.0/forgejo
bp-v8.0/forgejo-192177f
bp-v7.0/forgejo-05e163a
bp-v8.0/forgejo-e9e3b8c
v1.21/forgejo
v1.20/forgejo
v1.19/forgejo
v1.18/forgejo
v1.17/forgejo
v8.0.0
v7.0.6
v7.0.5
v9.0.0-dev
v7.0.4
v1.21.11-2
v7.0.3
v7.0.2
v7.0.1
v7.0.0
v1.21.11-1
v1.21.11-0
v1.21.10-0
v8.0.0-dev
v1.21.8-0
v1.21.7-0
v1.21.6-0
v1.21.5-0
v1.21.4-0
v1.21.3-0
v1.20.6-1
v1.21.2-1
v1.21.2-0
v1.20.6-0
v1.21.1-0
v1.20.5-1
v1.21.0-rc2
v1.21.0-rc1
v1.20.5-0
v7.0.0-dev
v1.21.0-rc0
v1.20.4-1
v1.20.4-0
v1.20.3-0
v1.20.2-0
v1.20.1-0
v1.20.0
v1.19.4-0
v1.21.0-dev
v1.20.0-rc2
v1.19.3-0
v1.19.2-0
v1.19.1-0
v1.19.0-3
v1.19.0-2
v1.18.5-0
v1.20.0-dev
v1.19.0-rc0
v1.18.3-2
v1.18.3-1
v1.18.3-0
v1.18.2-1
v1.18.2-0
v1.18.1-0
v1.18.0-1
v1.18.0-0
v1.18.0-rc1-2
v1.18.0-rc1-1
v1.18.0-rc1
v1.18.0-rc0
v1.19.0-dev
v1.17.3
v1.17.2
v1.17.1
v1.17.0
v1.17.0-rc2
v1.16.9
v1.17.0-rc1
v1.18.0-dev
v1.16.8
v1.16.7
v1.16.6
v1.16.5
v1.16.4
v1.16.3
v1.16.2
v1.16.1
v1.16.0
v1.15.11
v1.17.0-dev
v1.16.0-rc1
v1.15.10
v1.15.9
v1.15.8
v1.15.7
v1.15.6
v1.15.5
v1.15.4
v1.15.3
v1.15.2
v1.15.1
v1.14.7
v1.15.0
v1.15.0-rc3
v1.14.6
v1.15.0-rc2
v1.14.5
v1.16.0-dev
v1.15.0-rc1
v1.14.4
v1.14.3
v1.14.2
v1.14.1
v1.14.0
v1.13.7
v1.14.0-rc2
v1.13.6
v1.13.5
v1.14.0-rc1
v1.15.0-dev
v1.13.4
v1.13.3
v1.13.2
v1.13.1
v1.13.0
v1.12.6
v1.13.0-rc2
v1.14.0-dev
v1.13.0-rc1
v1.12.5
v1.12.4
v1.12.3
v1.12.2
v1.12.1
v1.11.8
v1.12.0
v1.11.7
v1.12.0-rc2
v1.11.6
v1.12.0-rc1
v1.13.0-dev
v1.11.5
v1.11.4
v1.11.3
v1.10.6
v1.12.0-dev
v1.11.2
v1.10.5
v1.11.1
v1.10.4
v1.11.0
v1.11.0-rc2
v1.10.3
v1.11.0-rc1
v1.10.2
v1.10.1
v1.10.0
v1.9.6
v1.9.5
v1.10.0-rc2
v1.11.0-dev
v1.10.0-rc1
v1.9.4
v1.9.3
v1.9.2
v1.9.1
v1.9.0
v1.9.0-rc2
v1.10.0-dev
v1.9.0-rc1
v1.8.3
v1.8.2
v1.8.1
v1.8.0
v1.8.0-rc3
v1.7.6
v1.8.0-rc2
v1.7.5
v1.8.0-rc1
v1.9.0-dev
v1.7.4
v1.7.3
v1.7.2
v1.7.1
v1.7.0
v1.7.0-rc3
v1.6.4
v1.7.0-rc2
v1.6.3
v1.7.0-rc1
v1.7.0-dev
v1.6.2
v1.6.1
v1.6.0
v1.6.0-rc2
v1.5.3
v1.6.0-rc1
v1.6.0-dev
v1.5.2
v1.5.1
v1.5.0
v1.5.0-rc2
v1.5.0-rc1
v1.5.0-dev
v1.4.3
v1.4.2
v1.4.1
v1.4.0
v1.4.0-rc3
v1.4.0-rc2
v1.3.3
v1.4.0-rc1
v1.3.2
v1.3.1
v1.3.0
v1.3.0-rc2
v1.3.0-rc1
v1.2.3
v1.2.2
v1.2.1
v1.2.0
v1.2.0-rc3
v1.2.0-rc2
v1.1.4
v1.2.0-rc1
v1.1.3
v1.1.2
v1.1.1
v1.1.0
v1.0.2
v1.0.1
v1.0.0
v0.9.99
Labels
Clear labels   
arch
amd64

Archived

  
arch
arm6

Archived

  
arch
arm64

Archived

  
arch
arm7

Archived

  
arch
riscv64

Archived

  
backport/v1.19

Scheduled for backport to Forgejo v1.19

Archived

  
backport/v1.20

Scheduled for backport to Forgejo v1.20

Archived

  
backport/v1.21/forgejo

Scheduled for backport to Forgejo v1.21

  
backport/v7.0/forgejo

Scheduled for backport to Forgejo v7.0

  
backport/v8.0/forgejo

Scheduled for backport to Forgejo v8.0

  
breaking

The release containing this change is not backward compatible

  
bug

Something is not working

Archived

  
bug
confirmed
it can be reproduced

  
bug
duplicate
bug has already been reported in the Forgejo tracker

  
bug
needs-more-info
the information provided does not contain enough details

  
bug
new-report
bug has just been reported and need triage (default label on issue creation)

  
bug
reported-upstream
bug cannot be fixed within Forgejo easily, it has been reported upstream

  
codeberg

related to Codeberg but not generic enough to apply to Forgejo

  
database
CockroachDB
https://github.com/cockroachdb/cockroach & https://codeberg.org/forgejo/discussions/issues/174

Archived

  
database
MySQL
https://www.mysql.com/

  
database
PostgreSQL
https://www.postgresql.org/

  
database
SQLite
https://sqlite.org/

  
dependency-upgrade

https://codeberg.org/forgejo/forgejo/issues/2779

  
dependency
ACT
https://code.forgejo.org/forgejo/act

Archived

  
dependency
alpine
https://alpinelinux.org/

Archived

  
dependency
asciinema-player
https://github.com/asciinema/asciinema-player

Archived

  
dependency
bleve
github.com/blevesearch/bleve

Archived

  
dependency
cache
https://codeberg.org/redict or https://redis.io/ or https://github.com/microsoft/garnet/

Archived

  
dependency
certmagic
github.com/caddyserver/certmagic

Archived

  
dependency
chart.js
https://github.com/chartjs/Chart.js

Archived

  
dependency
Chi
https://github.com/go-chi/chi/

Archived

  
dependency
Chroma
https://github.com/alecthomas/chroma/

Archived

  
dependency
citation.js
https://github.com/larsgw/citation.js/

Archived

  
dependency
codespell
https://github.com/codespell-project/codespell

Archived

  
dependency
css-loader
https://github.com/webpack-contrib/css-loader

Archived

  
dependency
devcontainers
https://github.com/devcontainers/cli

Archived

  
dependency
dropzone
https://github.com/dropzone/dropzone

Archived

  
dependency
editorconfig-checker
https://github.com/editorconfig-checker/editorconfig-checker

Archived

  
dependency
elasticsearch
https://www.elastic.co/elasticsearch

Archived

  
dependency
enmime
https://github.com/jhillyerd/enmime

Archived

  
dependency
F3
https://f3.forgefriends.org/

  
dependency
ForgeFed
https://forgefed.org

  
dependency
garage
https://git.deuxfleurs.fr/Deuxfleurs/garage

  
dependency
Git
https://git-scm.com/

Archived

  
dependency
git-backporting
https://github.com/kiegroup/git-backporting

Archived

  
dependency
Gitea
https://github.com/go-gitea/gitea

  
dependency
gitignore
https://github.com/github/gitignore

Archived

  
dependency
go-ap
https://github.com/go-ap/activitypub

Archived

  
dependency
go-enry
https://github.com/go-enry/go-enry

Archived

  
dependency
go-gitlab
https://github.com/xanzy/go-gitlab

Archived

  
dependency
Go-org
https://github.com/niklasfasching/go-org

Archived

  
dependency
go-rpmutils
https://github.com/sassoftware/go-rpmutils

Archived

  
dependency
go-sql-driver mysql
https://github.com/go-sql-driver/mysql/

Archived

  
dependency
go-swagger
github.com/go-swagger/go-swagger

Archived

  
dependency
go-version
https://github.com/hashicorp/go-version

Archived

  
dependency
go-webauthn
https://github.com/go-webauthn/webauthn

Archived

  
dependency
gocron
https://github.com/go-co-op/gocron

Archived

  
dependency
Golang
https://go.dev/

  
dependency
goldmark
https://github.com/yuin/goldmark

Archived

  
dependency
goquery
github.com/PuerkitoBio/goquery

Archived

  
dependency
Goth
https://github.com/markbates/goth/

Archived

  
dependency
grpc-go
https://github.com/grpc/grpc-go

Archived

  
dependency
happy-dom
https://github.com/capricorn86/happy-dom

Archived

  
dependency
Helm
https://helm.sh/

Archived

  
dependency
image-spec
https://github.com/opencontainers/image-spec

Archived

  
dependency
jsonschema
https://github.com/santhosh-tekuri/jsonschema

Archived

  
dependency
KaTeX
https://github.com/KaTeX/KaTeX

Archived

  
dependency
lint
All linting tools and libraries

Archived

  
dependency
MariaDB
https://mariadb.com/

Archived

  
dependency
Mermaid
https://github.com/mermaid-js/mermaid/

Archived

  
dependency
minio-go
https://github.com/minio/minio-go/

Archived

  
dependency
misspell
github.com/golangci/misspell/cmd/misspell

Archived

  
dependency
Monaco
https://github.com/microsoft/monaco-editor

Archived

  
dependency
PDFobject
https://pdfobject.com/

Archived

  
dependency
playwright
https://playwright.dev/

Archived

  
dependency
postcss
https://github.com/postcss/postcss

Archived

  
dependency
postcss-plugins
https://github.com/csstools/postcss-plugins

Archived

  
dependency
pprof
https://github.com/google/pprof

Archived

  
dependency
prometheus client_golang
https://github.com/prometheus/client_golang

Archived

  
dependency
protobuf
https://google.golang.org/protobuf

Archived

  
dependency
relative-time-element
https://github.com/github/relative-time-element

Archived

  
dependency
renovate
https://github.com/renovatebot/renovate

Archived

  
dependency
reply
https://code.forgejo.org/forgejo/reply

Archived

  
dependency
ssh
https://github.com/gliderlabs/ssh

Archived

  
dependency
swagger-ui
https://github.com/swagger-api/swagger-ui

Archived

  
dependency
tailwind
https://tailwindcss.com/

Archived

  
dependency
temporal-polyfill
https://github.com/fullcalendar/temporal-polyfill

Archived

  
dependency
terminal-to-html
github.com/buildkite/terminal-to-html

Archived

  
dependency
tests-only
Undifferentiated dependencies used for testing only

Archived

  
dependency
text-expander-element
https://github.com/github/text-expander-element

Archived

  
dependency
urfave
https://github.com/urfave/cli

Archived

  
dependency
vfsgen
https://github.com/lunny/vfsgen

Archived

  
dependency
vite
https://vitejs.dev/

Archived

  
dependency
Woodpecker CI
https://woodpecker-ci.org/

Archived

  
dependency
x tools
https://golang.org/x/tools

Archived

  
dependency
XORM
https://gitea.com/xorm/xorm

Archived

  
Discussion

   
duplicate

This issue or pull request already exists

  
enhancement/feature

New feature

  
forgejo/accessibility

Accessibility (a11y)

  
forgejo/actions

Actions

  
forgejo/api

API

  
forgejo/branding

Branding (logo, name, tagline etc.)

  
forgejo/ci

Forgejo Actions CI configuration

  
forgejo/documentation

   
forgejo/email

Everything related to email in Forgejo

  
forgejo/federation

Federation

  
forgejo/furnace cleanup

Keeping Forgejo in sync with its dependencies and contributing back to them

Archived

  
forgejo/internationalization

Internationalization (i18n) and Localization (l10n)

  
forgejo/moderation

Moderation

  
forgejo/privacy

Privacy first

  
forgejo/release

Release management

  
forgejo/scaling

Performance and scaling

  
forgejo/security

Security (please disclose responsibly)

  
forgejo/ui

User interface

  
Gain
High
User research provides indicators that this would be good to have, interested contributors are encouraged to pick this.

  
Gain
Nice to have
This is likely worth having, but the assumption is not backed by user research data (it might benefit a small amount of users only.) Unlikely to receive much attention, but feel free to pick.

  
Gain
Undefined
There is not enough information to justify the effort for this request, and the issue might get closed to stay focused. You can help with user research to collect information supporting this request.

  
Gain
Very High
User research confirms this is an important improvement for our users. Contributions very welcome!

  
good first issue

Start your contribution here! Optionally see who added the label, ask for help and watch out for further explanations.

  
issue
closed
The issue was resolved in the repository of the dependency

  
issue
do-not-exist-yet
An issue should be created in the respository of the dependency

  
issue
open
An open issue exists in the upstream repository of the dependency

  
manual test

Pull requests that have been merged with a manual test

Archived

  
Manually tested during feature freeze

The manual test instructions were followed

  
OS
FreeBSD
Specific to the FreeBSD Operating System

  
OS
Linux
Specific to (GNU/)Linux Operating Systems

  
OS
MacOS
Specific to the MacOS Operating System

  
OS
Windows
Specific to the Windows Operating System

  
regression

found in the version of the milestone and not before

  
release blocker

Issues that must be fixed before the release can be published

  
Release Cycle
Feature Freeze
Only bug fixes with automated tests (except for CSS/JavaScript)

  
release-blocker
v7.0
Issues that must be fixed before Forgejo v7.0 can be released 17 April 2024

Archived

  
release-blocker
v7.0.1
Issues that must be fixed before Forgejo v7.0.1 can be released

Archived

  
release-blocker
v7.0.2
Issues that must be fixed before Forgejo v7.0.2 can be released

Archived

  
release-blocker
v7.0.3
Issues that must be fixed before Forgejo v7.0.3 can be released

Archived

  
release-blocker
v7.0.4
Issues that must be fixed before Forgejo v7.0.4 can be released

Archived

  
release-blocker
v8.0.0
Issues that must be fixed before Forgejo v8.0.0 can be released

  
run-end-to-end-tests

Trigger additional tests on the PR when it is ready to be merged

  
test
manual
manual testing has been documented

  
test
needed
test should be added

  
test
needs-help
help needed to add a test

  
test
not-needed
no additional test is needed

  
test
present
test has been added

  
untested

Pull requests that have been merged with no test and submitted as is to the dependency where they belong

Archived

  
valuable code

This PR was closed because the implementation is incomplete

  
worth a release-note

Add this PR to the release notes

  
User Research - Accessibility

Requires input about accessibility features, likely involves user testing.

  
User Research - bug

Archived

  
User Research - Config (instance)

Problems and ideas on how to improve the instance-wide configuration.

  
User Research - Dashboard

Everything that could potentially fit a redesigned dashboard, including issue / PR / todo displays.

  
User Research - documentation

Archived

  
User Research - Errors

How to deal with errors in the application and write helpful error messages.

  
User Research - feature

Archived

  
User Research - federation

Archived

  
User Research - Filters

How filter and search is being worked with.

  
User Research - governance

Archived

  
User Research - Labels

Active research about Labels

  
User Research - Moderation

Moderation Featuers for Admins are undergoing active User Research

  
User Research - Needs Input

Use this label to let the User Research team know their input is requested.

  
User Research - Notifications

Research on how to improve the notification views is currently active.

  
User Research - release

Archived

  
User Research - Repo creation

Active research about the New Repo dialog.

  
User Research - Repo Units

The repo sections, disabling them and the "Add more" button.

  
User Research - security

   
User Research - Settings (in-app)

How to structure in-app settings in the future?

  
User Research - testing

Archived

  
User Research - UI

Archived

  
User Research - UX

Archived

No labels
arch
amd64
arch
arm6
arch
arm64
arch
arm7
arch
riscv64
backport/v1.19
backport/v1.20
backport/v1.21/forgejo
backport/v7.0/forgejo
backport/v8.0/forgejo
breaking
bug
bug
confirmed
bug
duplicate
bug
needs-more-info
bug
new-report
bug
reported-upstream
codeberg
database
CockroachDB
database
MySQL
database
PostgreSQL
database
SQLite
dependency-upgrade
dependency
ACT
dependency
alpine
dependency
asciinema-player
dependency
bleve
dependency
cache
dependency
certmagic
dependency
chart.js
dependency
Chi
dependency
Chroma
dependency
citation.js
dependency
codespell
dependency
css-loader
dependency
devcontainers
dependency
dropzone
dependency
editorconfig-checker
dependency
elasticsearch
dependency
enmime
dependency
F3
dependency
ForgeFed
dependency
garage
dependency
Git
dependency
git-backporting
dependency
Gitea
dependency
gitignore
dependency
go-ap
dependency
go-enry
dependency
go-gitlab
dependency
Go-org
dependency
go-rpmutils
dependency
go-sql-driver mysql
dependency
go-swagger
dependency
go-version
dependency
go-webauthn
dependency
gocron
dependency
Golang
dependency
goldmark
dependency
goquery
dependency
Goth
dependency
grpc-go
dependency
happy-dom
dependency
Helm
dependency
image-spec
dependency
jsonschema
dependency
KaTeX
dependency
lint
dependency
MariaDB
dependency
Mermaid
dependency
minio-go
dependency
misspell
dependency
Monaco
dependency
PDFobject
dependency
playwright
dependency
postcss
dependency
postcss-plugins
dependency
pprof
dependency
prometheus client_golang
dependency
protobuf
dependency
relative-time-element
dependency
renovate
dependency
reply
dependency
ssh
dependency
swagger-ui
dependency
tailwind
dependency
temporal-polyfill
dependency
terminal-to-html
dependency
tests-only
dependency
text-expander-element
dependency
urfave
dependency
vfsgen
dependency
vite
dependency
Woodpecker CI
dependency
x tools
dependency
XORM
Discussion
duplicate
enhancement/feature
forgejo/accessibility
forgejo/actions
forgejo/api
forgejo/branding
forgejo/ci
forgejo/documentation
forgejo/email
forgejo/federation
forgejo/furnace cleanup
forgejo/internationalization
forgejo/moderation
forgejo/privacy
forgejo/release
forgejo/scaling
forgejo/security
forgejo/ui
Gain
High
Gain
Nice to have
Gain
Undefined
Gain
Very High
good first issue
issue
closed
issue
do-not-exist-yet
issue
open
manual test
Manually tested during feature freeze
OS
FreeBSD
OS
Linux
OS
MacOS
OS
Windows
regression
release blocker
Release Cycle
Feature Freeze
release-blocker
v7.0
release-blocker
v7.0.1
release-blocker
v7.0.2
release-blocker
v7.0.3
release-blocker
v7.0.4
release-blocker
v8.0.0
run-end-to-end-tests
test
manual
test
needed
test
needs-help
test
not-needed
test
present
untested
valuable code
worth a release-note
User Research - Accessibility
User Research - bug
User Research - Config (instance)
User Research - Dashboard
User Research - documentation
User Research - Errors
User Research - feature
User Research - federation
User Research - Filters
User Research - governance
User Research - Labels
User Research - Moderation
User Research - Needs Input
User Research - Notifications
User Research - release
User Research - Repo creation
User Research - Repo Units
User Research - security
User Research - Settings (in-app)
User Research - testing
User Research - UI
User Research - UX
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
3 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: forgejo/forgejo#51
No description provided.
Delete branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?