Archive
- The current branches are archived using main.sh archive_branches.
Gitea main & stable
- rebase Gitea main with [FORGEJO] temporarily remove .github & .gitea on top
- force push Gitea main
- push release/v1.20, release/v1.21 in forgejo
Rebase milestone
- Created manually https://codeberg.org/forgejo/forgejo/milestone/5539
- All PRs in the milestone are prepared main.sh rebase_*
- Each PR has comments to document the manual actions
- Conflicts are documented
- Commits are squashed when possible to keep the commit history readable and minimal
development
When commits move from one feature branch to another; one branch
cherry-picks them, the other skips them.
For each branch forgejo-{ci,development,privacy,branding,f3,moderation,dependency} go over the
commits it contains. If one of them does not belong and should be moved to another branch
add it to the forgejo-??? takes commits from forgejo-??? section.
forgejo-???takes commits fromforgejo-???- ???
Per-branch notes.
-
forgejo-????- ???
-
forgejo-development- go run golang.org/x/tools/internal/cmd/deadcode@v0.14.0 -generated=false -test code.gitea.io/gitea > .deadcode-out
-
forgejo-i18n- no longer needed forgejo/discussions#104
-
forgejo-dependency- [GITEA] notifies admins on new user registration will conflict on translation, resove welcome to forgejo
Once all branches pass
- reset to forgejo/main
- merge
forgejo-{privacy,branding,moderation,dependency}intoforgejo - push to a temporary PR #2252
- close the PR when the tests pass
- force push to
forgejo - branch run
- delete release v1.22.0-test https://codeberg.org/forgejo-integration/forgejo/releases/tag/v1.22.0-test
- force push tag v1.22.0-test to https://codeberg.org/forgejo-integration/forgejo/actions/runs/280
- close matching https://code.forgejo.org/forgejo/end-to-end/pulls
- verify the container image
docker rm -f forgejo docker rmi codeberg.org/forgejo-integration/forgejo:1.22.0-test docker run -d --name forgejo -p 8080:3000 -e FORGEJO__server__LFS_START_SERVER=true -e FORGEJO__security__INSTALL_LOCK=true -e FORGEJO__log__LEVEL=debug -e FORGEJO__server__ROOT_URL=http://0.0.0.0:8080/ -e FORGEJO__actions__ENABLED=true codeberg.org/forgejo-integration/forgejo:1.22.0-test bash -c '/bin/s6-svscan /etc/s6 & sleep 10 ; su -c "forgejo admin user create --admin --username root --password admin1234 --email root@example.com" git && sleep infinity' firefox 0.0.0.0:8080 - verify the binary
wget -O forgejo https://codeberg.org/forgejo-integration/forgejo/releases/download/v1.22.0-test/forgejo-1.22.0-test-linux-amd64 chmod +x forgejo ./forgejo forgejo-cli actions -h - verify the sources
wget -O forgejo.tar.gz https://codeberg.org/forgejo-integration/forgejo/releases/download/v1.22.0-test/forgejo-src-1.22.0-test.tar.gz rm -fr forgejo-src-1.22.0-test tar -zxvf forgejo.tar.gz cd forgejo-src-1.22.0-test make TAGS='bindata sqlite sqlite_unlock_notify' forgejo - delete release v1.22.0-test https://codeberg.org/forgejo-experimental/forgejo/releases/tag/v1.22.0-test
- force push tag v1.22.0-test to https://codeberg.org/forgejo-experimental https://codeberg.org/forgejo-experimental/forgejo/actions/runs/166
- docker pull codeberg.org/forgejo-experimental/forgejo:1.22.0-test # verify it is the same as integration
- upgrade next.forgejo.org https://forgejo.org/docs/next/developer/infrastructure/#containers-1
- to the development room
The Forgejo v1.22.0-test weekly release is running on https://next.forgejo.org and is also available ([binary](https://codeberg.org/forgejo-experimental/forgejo/releases/tag/v1.22.0-test) and [OCI](https://codeberg.org/forgejo-experimental/-/packages/container/forgejo/1.22.0-test)) to get a taste of what v1.22 will be like. ⚠️ Do not run this in production.
### Archive
- [x] The current branches are archived using [main.sh archive_branches](https://codeberg.org/forgejo-contrib/soft-fork-tools).
### Gitea main & stable
- [x] rebase Gitea main with [FORGEJO] temporarily remove .github & .gitea on top
- [x] force push Gitea main
- [x] push release/v1.20, release/v1.21 in forgejo
### Rebase milestone
* Created manually https://codeberg.org/forgejo/forgejo/milestone/5539
* All PRs in the milestone are prepared [main.sh rebase_*](https://codeberg.org/forgejo-contrib/soft-fork-tools)
* Each PR has comments to document the manual actions
* Conflicts are documented
* Commits are squashed when possible to keep the commit history readable and minimal
#### development
When commits move from one feature branch to another; one branch
cherry-picks them, the other skips them.
For each branch `forgejo-{ci,development,privacy,branding,f3,moderation,dependency}` go over the
commits it contains. If one of them does not belong and should be moved to another branch
add it to the `forgejo-???` takes commits from `forgejo-???` section.
* `forgejo-???` takes commits from `forgejo-???`
* ???
Per-branch notes.
* `forgejo-????`
* ???
* `forgejo-development`
* go run golang.org/x/tools/internal/cmd/deadcode@v0.14.0 -generated=false -test code.gitea.io/gitea > .deadcode-out
* `forgejo-i18n`
* no longer needed https://codeberg.org/forgejo/discussions/issues/104
* `forgejo-dependency`
* [GITEA] notifies admins on new user registration will conflict on translation, resove welcome to forgejo
Once all branches pass
* reset to forgejo/main
* merge `forgejo-{privacy,branding,moderation,dependency}` into `forgejo`
* [x] push to a temporary PR https://codeberg.org/forgejo/forgejo/pulls/2252
* [x] close the PR when the tests pass
* force push to `forgejo`
* [x] branch run
* [x] https://codeberg.org/forgejo/forgejo/actions/runs/6033
* [x] delete release v1.22.0-test https://codeberg.org/forgejo-integration/forgejo/releases/tag/v1.22.0-test
* [x] force push tag v1.22.0-test to https://codeberg.org/forgejo-integration/forgejo/actions/runs/280
- [x] close matching https://code.forgejo.org/forgejo/end-to-end/pulls
* [x] verify the container image
```
docker rm -f forgejo
docker rmi codeberg.org/forgejo-integration/forgejo:1.22.0-test
docker run -d --name forgejo -p 8080:3000 -e FORGEJO__server__LFS_START_SERVER=true -e FORGEJO__security__INSTALL_LOCK=true -e FORGEJO__log__LEVEL=debug -e FORGEJO__server__ROOT_URL=http://0.0.0.0:8080/ -e FORGEJO__actions__ENABLED=true codeberg.org/forgejo-integration/forgejo:1.22.0-test bash -c '/bin/s6-svscan /etc/s6 & sleep 10 ; su -c "forgejo admin user create --admin --username root --password admin1234 --email root@example.com" git && sleep infinity'
firefox 0.0.0.0:8080
```
* [x] verify the binary
```
wget -O forgejo https://codeberg.org/forgejo-integration/forgejo/releases/download/v1.22.0-test/forgejo-1.22.0-test-linux-amd64
chmod +x forgejo
./forgejo forgejo-cli actions -h
```
* [x] verify the sources
```
wget -O forgejo.tar.gz https://codeberg.org/forgejo-integration/forgejo/releases/download/v1.22.0-test/forgejo-src-1.22.0-test.tar.gz
rm -fr forgejo-src-1.22.0-test
tar -zxvf forgejo.tar.gz
cd forgejo-src-1.22.0-test
make TAGS='bindata sqlite sqlite_unlock_notify' forgejo
* [x] delete release v1.22.0-test https://codeberg.org/forgejo-experimental/forgejo/releases/tag/v1.22.0-test
* [x] force push tag v1.22.0-test to https://codeberg.org/forgejo-experimental https://codeberg.org/forgejo-experimental/forgejo/actions/runs/166
* [x] docker pull codeberg.org/forgejo-experimental/forgejo:1.22.0-test # verify it is the same as integration
* [x] upgrade next.forgejo.org https://forgejo.org/docs/next/developer/infrastructure/#containers-1
* [x] to the development room
```
The Forgejo v1.22.0-test weekly release is running on https://next.forgejo.org and is also available ([binary](https://codeberg.org/forgejo-experimental/forgejo/releases/tag/v1.22.0-test) and [OCI](https://codeberg.org/forgejo-experimental/-/packages/container/forgejo/1.22.0-test)) to get a taste of what v1.22 will be like. ⚠️ Do not run this in production.
```