Recurring forgefriends sync / rebase on Gitea

dachary · July 10, 2022, 2:48pm

Today’s rebasing took ~5 minutes (27 new commits), no conflicts.

$ git describe gitea/main
v1.18.0-dev-86-ge24b0fc7b
$ git log --oneline --no-merges gitea/main..origin/main
76d7dff68 (HEAD -> main, origin/main, origin/feature-projectbase, feature-projectbase) projectbase: implement tests for UpdateProjectBase
79a6d81e0 repo: add a .projectbase repository to each project
adb1cdfe0 repository: cloneLink(suffix) instead of cloneLink(isWiki)
2ea6012ab (origin/feature-fff, origin/base-fff, feature-fff, base-fff) gofff: replace Gitea migration
420c8b54c gofff: get module
6d327d2cd gofff: lfs not implemented yet
ed7f32c2e gofff: remove the Gitea migration implementation
310ad0e5a (origin/feature-gitlab-ci, feature-gitlab-ci) tests: do not test against the GitHub API
b853870b5 CI: unit tests for models race with each other and sometime fail
6385c94a4 CI: setup GitLab CI
22113c132 (origin/feature-development-environment, feature-development-environment) gitignore: emacs backups
a51374373 (origin/feature-licensing, feature-licensing) forgefriends is licensed under AGPLv3+

dachary · July 17, 2022, 7:58am

Today’s rebasing took ~10 minutes (40 new commits):

README.md conflicts
integrations/dump_restore_test.go typo fix

$ git describe gitea/main
v1.18.0-dev-126-g17ce5f866
$ git log --oneline --no-merges gitea/main..origin/main
2b1475bc4 (HEAD -> main, origin/main, origin/feature-projectbase, feature-projectbase) projectbase: implement tests for UpdateProjectBase
7e99662f5 repo: add a .projectbase repository to each project
272e012ce repository: cloneLink(suffix) instead of cloneLink(isWiki)
624e2ec2f (origin/feature-fff, origin/base-fff, feature-fff, base-fff) gofff: replace Gitea migration
bc3a61412 gofff: get module
b364af60d gofff: lfs not implemented yet
84563ac67 gofff: remove the Gitea migration implementation
41507eeca (origin/feature-development-environment, feature-development-environment) gitignore: emacs backups
19246f22c (origin/feature-gitlab-ci, feature-gitlab-ci) tests: do not test against the GitHub API
dfe5bc22c CI: unit tests for models race with each other and sometime fail
643454e45 CI: setup GitLab CI
2f029b550 (origin/feature-licensing, feature-licensing) forgefriends is licensed under AGPLv3+

dachary · July 23, 2022, 8:14am

Today’s rebasing took ~5 minutes (20 new commits), no conflicts.

$ git describe gitea/main
v1.18.0-dev-146-g14178c56b
$ git log --oneline --no-merges gitea/main..origin/main
4e0eab23d (HEAD -> main, origin/main, origin/feature-projectbase, feature-projectbase) projectbase: implement tests for UpdateProjectBase
57e745a18 repo: add a .projectbase repository to each project
26a8ede9f repository: cloneLink(suffix) instead of cloneLink(isWiki)
7af88d777 (origin/feature-f3, origin/base-f3, feature-f3, base-f3) gofff: replace Gitea migration
9cae36dc7 gofff: get module
b434085c4 gofff: lfs not implemented yet
c2720ae21 gofff: remove the Gitea migration implementation
890e8579a (origin/feature-development-environment, feature-development-environment) gitignore: emacs backups
6a480020a (origin/feature-gitlab-ci, feature-gitlab-ci) tests: do not test against the GitHub API
aab84c051 CI: unit tests for models race with each other and sometime fail
f1e644014 CI: setup GitLab CI
17640aaa9 (origin/feature-licensing, feature-licensing) forgefriends is licensed under AGPLv3+

dachary · July 30, 2022, 5:18am

Today’s rebasing took ~5 minutes (35 new commits), trivial conflict in the README.md

$ git describe gitea/main
v1.18.0-dev-181-g33bb7c485
$ git log --oneline --no-merges gitea/main..origin/main
cee15ad60 (HEAD -> main, origin/main, origin/feature-projectbase, feature-projectbase) projectbase: implement tests for UpdateProjectBase
f3b969e97 repo: add a .projectbase repository to each project
12409eb13 repository: cloneLink(suffix) instead of cloneLink(isWiki)
839b1c50d (origin/feature-f3, origin/base-f3, feature-f3, base-f3) gofff: replace Gitea migration
4e018637e gofff: get module
0e299d9af gofff: lfs not implemented yet
a26ae070e gofff: remove the Gitea migration implementation
5cc91d446 (origin/feature-development-environment, feature-development-environment) gitignore: emacs backups
289b2d978 (origin/feature-gitlab-ci, feature-gitlab-ci) tests: do not test against the GitHub API
e4ba171e3 CI: unit tests for models race with each other and sometime fail
190e20174 CI: setup GitLab CI
4288d4278 (origin/feature-licensing, feature-licensing) forgefriends is licensed under AGPLv3+

dachary · August 8, 2022, 7:04am

Today’s rebasing took ~5 minutes (55 new commits)

$ git describe gitea/main
v1.18.0-dev-236-g498352c21
$ git log --oneline --no-merges gitea/main..origin/main
6346a8bfb (HEAD -> main, origin/main, origin/feature-projectbase, feature-projectbase) projectbase: implement tests for UpdateProjectBase
916e1ee7c repo: add a .projectbase repository to each project
184db474a repository: cloneLink(suffix) instead of cloneLink(isWiki)
b983e9cbe (origin/feature-f3, origin/base-f3, feature-f3, base-f3) gofff: replace Gitea migration
e10086659 gofff: get module
04b871dc7 gofff: lfs not implemented yet
3e66049f2 gofff: remove the Gitea migration implementation
86122cb6b (origin/feature-gitlab-ci, feature-gitlab-ci) tests: do not test against the GitHub API
3076eaaaa CI: unit tests for models race with each other and sometime fail
0b1157038 CI: setup GitLab CI
5a02e5fb8 (origin/feature-development-environment, feature-development-environment) gitignore: emacs backups
a236cdaf8 (origin/feature-licensing, feature-licensing) forgefriends is licensed under AGPLv3+

dachary · August 13, 2022, 12:58am

Today’s rebasing took ~10 minutes (33 new commits)

switch GitLab CI to go 1.19

$ git describe gitea/main
v1.18.0-dev-269-g20b3a9045
$ git log --oneline --no-merges gitea/main..origin/main
a23086930 (HEAD -> main, origin/main, origin/feature-projectbase, feature-projectbase) projectbase: implement tests for UpdateProjectBase
08cbb7ed5 repo: add a .projectbase repository to each project
a468f925f repository: cloneLink(suffix) instead of cloneLink(isWiki)
84f53565e (origin/feature-f3, origin/base-f3, feature-f3, base-f3) gofff: replace Gitea migration
1d2b0656a gofff: get module
50d6c4762 gofff: lfs not implemented yet
5998b3748 gofff: remove the Gitea migration implementation
3a6da3dbd (origin/feature-gitlab-ci, feature-gitlab-ci) tests: do not test against the GitHub API
f12fb0ad2 CI: unit tests for models race with each other and sometime fail
be3932456 CI: setup GitLab CI
a0a55052f (origin/feature-development-environment, feature-development-environment) gitignore: emacs backups
ea46d088c (origin/feature-licensing, feature-licensing) forgefriends is licensed under AGPLv3+

dachary · August 20, 2022, 10:08pm

Today’s rebasing took ~15 minutes (38 new commits)

AssertExistsAndLoadBean now use generics

$ git describe gitea/main
v1.18.0-dev-307-g7258a124a
$ git log --oneline --no-merges gitea/main..origin/main
c0bbdad47 (HEAD -> main, origin/main, origin/feature-projectbase, feature-projectbase) projectbase: implement tests for UpdateProjectBase
88430807e repo: add a .projectbase repository to each project
3d488d432 repository: cloneLink(suffix) instead of cloneLink(isWiki)
1cdc216a1 (origin/feature-f3, origin/base-f3, feature-f3, base-f3) gofff: replace Gitea migration
5cf14bc2d gofff: get module
9c99de564 gofff: lfs not implemented yet
8182fc2e4 gofff: remove the Gitea migration implementation
ec5244c36 (origin/feature-development-environment, feature-development-environment) gitignore: emacs backups
8928b08b5 (origin/feature-gitlab-ci, feature-gitlab-ci) tests: do not test against the GitHub API
114214300 CI: unit tests for models race with each other and sometime fail
025bd9f1f CI: setup GitLab CI
78082d80b (origin/feature-licensing, feature-licensing) forgefriends is licensed under AGPLv3+

dachary · August 28, 2022, 1:52am

Today’s rebasing took ~20 minutes (40 new commits)

Conflicts because of

https://github.com/go-gitea/gitea/pull/20869 (just ignore the changes is fine)
https://github.com/go-gitea/gitea/pull/20262 (s/models/repo_model/)

$ git describe gitea/main
v1.18.0-dev-347-g532c223c4
$ git log --oneline --no-merges gitea/main..origin/main
73c74e91f (HEAD -> main, origin/main, origin/feature-projectbase, feature-projectbase) projectbase: implement tests for UpdateProjectBase
89a3c77bb repo: add a .projectbase repository to each project
e8eb184e1 repository: cloneLink(suffix) instead of cloneLink(isWiki)
1e8a247d5 (origin/feature-f3, origin/base-f3, feature-f3, base-f3) gofff: replace Gitea migration
380c8933b gofff: get module
c5b02b682 gofff: lfs not implemented yet
900112e75 gofff: remove the Gitea migration implementation
a3bc8988a (origin/feature-development-environment, feature-development-environment) gitignore: emacs backups
db656b324 (origin/feature-gitlab-ci, feature-gitlab-ci) tests: do not test against the GitHub API
c96c192d0 CI: unit tests for models race with each other and sometime fail
5ff1b0176 CI: setup GitLab CI
9a5bc2e91 (origin/feature-licensing, feature-licensing) forgefriends is licensed under AGPLv3+

dachary · September 5, 2022, 5:55am

Today’s rebasing took 30min (41 new commits):

Lots of conflicts because integration tests moved in a subdirectory. Projectbase was discarded.

$ git describe gitea/main
v1.18.0-dev-388-g023260173
$ git log --oneline --no-merges gitea/main..origin/main
20b4965b0 (origin/feature-gitlab-ci, feature-gitlab-ci) CI: setup GitLab CI
81a77cece tests: do not test against the GitHub API
a2a994568 CI: unit tests for models race with each other and sometime fail
e6202ea3d (origin/feature-development-environment, feature-development-environment) gitignore: emacs backups
b8bdde49b (origin/feature-licensing, feature-licensing) forgefriends is licensed under AGPLv3+

dachary · September 11, 2022, 10:27pm

Today’s rebasing took 5min (28 new commits).

$ git describe gitea/main
v1.18.0-dev-416-g23fbf5e1e
$ git log --oneline --no-merges gitea/main..origin/main
1b153c8a3 (origin/feature-gitlab-ci, feature-gitlab-ci) CI: setup GitLab CI
ee44f13c6 tests: do not test against the GitHub API
5851100d1 CI: unit tests for models race with each other and sometime fail
78c23710c (origin/feature-development-environment, feature-development-environment) gitignore: emacs backups
bdd181277 (origin/feature-licensing, feature-licensing) forgefriends is licensed under AGPLv3+

dachary · September 18, 2022, 4:44am

Today’s rebasing took 10min (20 new commits).

Switched to 1.19 for GitLab CI, which is OK now that 1.19.1 has been published and some generic related crash were fixed.

$ git describe gitea/main
v1.18.0-dev-436-g395f65c65
$ git log --oneline --no-merges gitea/main..origin/main
1bcc8b86c (origin/feature-gitlab-ci, feature-gitlab-ci) CI: setup GitLab CI
94c2a49a9 tests: do not test against the GitHub API
2b4fa845a CI: unit tests for models race with each other and sometime fail
ffeb79952 (origin/feature-development-environment, feature-development-environment) gitignore: emacs backups
dfdee5334 (origin/feature-licensing, feature-licensing) forgefriends is licensed under AGPLv3+

dachary · September 24, 2022, 8:02am

Today’s rebasing took 5min (15 new commits).

$ git describe gitea/main
v1.18.0-dev-451-gda0a9ec81
$ git log --oneline --no-merges gitea/main..origin/main
f00b4c3d5 (HEAD -> main, origin/main, origin/feature-f3, origin/base-f3, feature-f3, base-f3) F3: Gitea driver and CLI
dc225ec0f (origin/feature-development-environment, feature-development-environment) gitignore: emacs backups
a385cadc3 (origin/feature-gitlab-ci, feature-gitlab-ci) CI: setup GitLab CI
88354e871 tests: do not test against the GitHub API
e7e3e3682 CI: unit tests for models race with each other and sometime fail
339795a2e (origin/feature-licensing, feature-licensing) forgefriends is licensed under AGPLv3+

dachary · October 2, 2022, 9:45am

Today’s rebasing took 5min (34 new commits).

$ git describe gitea/main
v1.18.0-dev-485-gf82f1d05b
$ git log --oneline --no-merges gitea/main..origin/main
7c6628dba (HEAD -> main, origin/main, origin/feature-f3, origin/base-f3, feature-f3, base-f3) F3: Gitea driver and CLI
207d8d279 (origin/feature-gitlab-ci, feature-gitlab-ci) CI: setup GitLab CI
1df819e17 tests: do not test against the GitHub API
92e2ec557 CI: unit tests for models race with each other and sometime fail
3db06e068 (origin/feature-development-environment, feature-development-environment) gitignore: emacs backups
50c80e3d6 (origin/feature-licensing, feature-licensing) forgefriends is licensed under AGPLv3+

dachary · October 9, 2022, 5:39am

Today’s rebasing took 5min (31 new commits).

$ git describe gitea/main
v1.18.0-dev-516-g768e16dad
$ git log --oneline --no-merges gitea/main..origin/main
0a3587685 (HEAD -> main, origin/main, origin/feature-f3, origin/base-f3, feature-f3, base-f3) F3: Gitea driver and CLI
0114dfb76 (origin/feature-development-environment, feature-development-environment) gitignore: emacs backups
39e79e276 (origin/feature-gitlab-ci, feature-gitlab-ci) CI: setup GitLab CI
88f144d90 tests: do not test against the GitHub API
1a9a975bc CI: unit tests for models race with each other and sometime fail
69860fd88 (origin/feature-licensing, feature-licensing) forgefriends is licensed under AGPLv3+

dachary · October 16, 2022, 5:34pm

Today’s rebasing took 5min (54 new commits).

$ git describe gitea/main
v1.18.0-dev-570-g9fb251fb6
$ git log --oneline --no-merges gitea/main..origin/main
d6241f217 (HEAD -> main, origin/main, origin/feature-f3, origin/base-f3, feature-f3, base-f3) F3: Gitea driver and CLI
f149f0b1c (origin/feature-gitlab-ci, feature-gitlab-ci) CI: setup GitLab CI
15acb0b2f tests: do not test against the GitHub API
1a29db46c CI: unit tests for models race with each other and sometime fail
c2e36d261 (origin/feature-development-environment, feature-development-environment) gitignore: emacs backups
3f8e82d06 (origin/feature-licensing, feature-licensing) forgefriends is licensed under AGPLv3+

dachary · October 23, 2022, 6:22am

Today’s rebasing took 5min (43 new commits).

$ git describe gitea/main
v1.18.0-dev-613-g63ebb53fd
$ git log --oneline --no-merges gitea/main..origin/main
4f59ee334 (HEAD -> main, origin/main, origin/feature-f3, origin/base-f3, feature-f3, base-f3) F3: Gitea driver and CLI
ebe3abe6d (origin/feature-gitlab-ci, feature-gitlab-ci) CI: setup GitLab CI
10b6711eb tests: do not test against the GitHub API
c913137a0 CI: unit tests for models race with each other and sometime fail
4af9f270f (origin/feature-development-environment, feature-development-environment) gitignore: emacs backups
52bec448a (origin/feature-licensing, feature-licensing) forgefriends is licensed under AGPLv3+

dachary · November 1, 2022, 5:59am

Today’s rebasing took 5min (45 new commits).

$ git describe gitea/main
v1.19.0-dev-26-gf211d235c
$ git log --oneline --no-merges gitea/main..origin/main
16c641fe0 (HEAD -> main, origin/main, origin/feature-f3, feature-f3) F3: Gitea driver and CLI
4f2d1d2ae (origin/feature-development-environment, feature-development-environment) gitignore: emacs backups
e2c86c4a0 (origin/feature-gitlab-ci, feature-gitlab-ci) CI: setup GitLab CI
529e894e1 tests: do not test against the GitHub API
62f343882 CI: unit tests for models race with each other and sometime fail
51bc50244 (origin/feature-licensing, feature-licensing) forgefriends is licensed under AGPLv3+

dachary · November 6, 2022, 8:22pm

Today’s rebasing took 5min (22 new commits).

Minor conflict because s/GO_PACKAGES/GO_TEST_PACKAGES/ in the Makefile

$ git describe gitea/main
v1.19.0-dev-43-g57df0f116
$  git log --oneline --no-merges gitea/main..origin/main
4be259ea8 (HEAD -> main, origin/main, origin/feature-f3, feature-f3) F3: Gitea driver and CLI
81e241f84 (origin/feature-development-environment, feature-development-environment) gitignore: emacs backups
2d2c6e6ed (origin/feature-gitlab-ci, feature-gitlab-ci) CI: setup GitLab CI
110b671a7 tests: do not test against the GitHub API
476b722ce CI: unit tests for models race with each other and sometime fail
ed5655ab5 (origin/feature-licensing, feature-licensing) forgefriends is licensed under AGPLv3+

dachary · November 13, 2022, 4:08pm

Today’s rebasing took 30min (28 new commits).

services/f3/driver/reaction.go:154:25: not enough arguments in call to db.TxContext on the F3 branch

$ git describe gitea/main
v1.19.0-dev-71-g6f3efdfe1
$ git log --oneline --no-merges gitea/main..origin/main
978a9a9f1 (origin/main, origin/feature-f3, main, feature-f3) F3: Gitea driver and CLI
d91998a0c (origin/feature-development-environment, feature-development-environment) gitignore: emacs backups
b06f707fa (origin/feature-licensing, feature-licensing) forgefriends is licensed under AGPLv3+
16ad316f0 (origin/feature-gitlab-ci, feature-gitlab-ci) CI: setup GitLab CI
1715f5f08 tests: do not test against the GitHub API
7da22f0e5 CI: unit tests for models race with each other and sometime fail

dachary · November 26, 2022, 12:48am

This is now happening at #51 - [WORKFLOW] sync Forgejo with Gitea - forgejo - Codeberg.org