Recurring forgefriends sync / rebase on Gitea

Today’s rebasing took 10 minutes (28 new commits). There was one conflict for go-fed because other packages have been updated.

$ git describe gitea/main
v1.17.0-dev-574-gcafa2dcb8
$ git log --oneline --no-merges gitea/main..origin/main
988443a7c (HEAD -> main, origin/main, origin/feature-activitypub, feature-activitypub) activitypub: implement Repository
f2c8b594b activitypub: hack_16834
ff991b4d7 activitypub: implement the ReqSignature middleware
e92f8610e activitypub: signing http client
b7991f880 activitypub: go-fed conformant Clock instance
7eaf68082 activitypub: add the public key to Person (#14186)
d647b9896 activitypub: implement /api/v1/activitypub/user/{username} (#14186)
90abf75e0 (origin/feature-projectbase, feature-projectbase) projectbase: implement tests for UpdateProjectBase
23e751028 repo: add a .projectbase repository to each project
aa0a8deec repository: cloneLink(suffix) instead of cloneLink(isWiki)
24fa22ce6 (origin/feature-development-environment, feature-development-environment) gitignore: emacs backups
1312906ec (origin/feature-gitlab-ci, feature-gitlab-ci) tests: do not test against the GitHub API
ad0e0d206 CI: unit tests for models race with each other and sometime fail
f875d5aa4 CI: setup GitLab CI
d7b36bfa4 (origin/feature-go-fed, feature-go-fed) go.mod: add go-fed/{httpsig,activity/pub,activity/streams} dependency
2d97cfcf5 (origin/feature-licensing, feature-licensing) forgefriends is licensed under AGPLv3+
1 Like

Today’s rebasing took 10 minutes (36 new commits). There were errors because the signature of GetUserByName changed.


$ git describe gitea/main
v1.17.0-dev-610-gfa5dec966
$ git log --oneline --no-merges gitea/main..origin/main
32a3d3302 (HEAD -> main, origin/main, origin/feature-activitypub, feature-activitypub) activitypub: implement Repository
4dfa0a7a7 activitypub: hack_16834
0b7a0b325 activitypub: implement the ReqSignature middleware
10e3a0c99 activitypub: signing http client
aa8cd052e activitypub: go-fed conformant Clock instance
85d2b93ae activitypub: add the public key to Person (#14186)
cf1b83532 activitypub: implement /api/v1/activitypub/user/{username} (#14186)
57de1ec9d (origin/feature-projectbase, feature-projectbase) projectbase: implement tests for UpdateProjectBase
d702e9afd repo: add a .projectbase repository to each project
cebbc1cf3 repository: cloneLink(suffix) instead of cloneLink(isWiki)
2d63bfdfe (origin/feature-development-environment, feature-development-environment) gitignore: emacs backups
1ca9b2028 (origin/feature-gitlab-ci, feature-gitlab-ci) tests: do not test against the GitHub API
cac575bd7 CI: unit tests for models race with each other and sometime fail
ef49ecb37 CI: setup GitLab CI
ba07b6918 (origin/feature-go-fed, feature-go-fed) go.mod: add go-fed/{httpsig,activity/pub,activity/streams} dependency
45ad73110 (origin/feature-licensing, feature-licensing) forgefriends is licensed under AGPLv3+
1 Like

Today’s rebasing took 15 minutes (19 new commits). There were merge conflicts because new go modules were added and the Makefile was slightly modified.


$ git describe gitea/main
v1.17.0-dev-629-ge0273bad7
$ git log --oneline --no-merges gitea/main..origin/main
f94b7bc60 (HEAD -> main, origin/main, origin/feature-activitypub, feature-activitypub) activitypub: implement Repository
72cd1e1a4 activitypub: hack_16834
2de95230e activitypub: implement the ReqSignature middleware
a6ee177e4 activitypub: signing http client
bb5ded72a activitypub: go-fed conformant Clock instance
fee19177e activitypub: add the public key to Person (#14186)
cdfca4910 activitypub: implement /api/v1/activitypub/user/{username} (#14186)
09c3658ce (origin/feature-projectbase, feature-projectbase) projectbase: implement tests for UpdateProjectBase
13aecef5b repo: add a .projectbase repository to each project
c08d86c74 repository: cloneLink(suffix) instead of cloneLink(isWiki)
0aaf4f259 (origin/feature-gitlab-ci, feature-gitlab-ci) tests: do not test against the GitHub API
7192638f4 CI: unit tests for models race with each other and sometime fail
3f76569c8 CI: setup GitLab CI
854a4be6d (origin/feature-development-environment, feature-development-environment) gitignore: emacs backups
0a59a3809 (origin/feature-go-fed, feature-go-fed) go.mod: add go-fed/{httpsig,activity/pub,activity/streams} dependency
1a7dfdab8 (origin/feature-licensing, feature-licensing) forgefriends is licensed under AGPLv3+

Today’s rebasing took 10 minutes (35 new commits). There were merge conflicts because go-fed/httpsig was added as a dependency (but not the same version as what go-fed needs).


$ git describe gitea/main
v1.17.0-dev-664-g73382d213
$ git log --oneline --no-merges gitea/main..origin/main
f94b7bc60 (origin/main) activitypub: implement Repository
72cd1e1a4 activitypub: hack_16834
2de95230e activitypub: implement the ReqSignature middleware
a6ee177e4 activitypub: signing http client
bb5ded72a activitypub: go-fed conformant Clock instance
fee19177e activitypub: add the public key to Person (#14186)
cdfca4910 activitypub: implement /api/v1/activitypub/user/{username} (#14186)
09c3658ce projectbase: implement tests for UpdateProjectBase
13aecef5b repo: add a .projectbase repository to each project
c08d86c74 repository: cloneLink(suffix) instead of cloneLink(isWiki)
0aaf4f259 tests: do not test against the GitHub API
7192638f4 CI: unit tests for models race with each other and sometime fail
3f76569c8 CI: setup GitLab CI
854a4be6d gitignore: emacs backups
0a59a3809 go.mod: add go-fed/{httpsig,activity/pub,activity/streams} dependency
1a7dfdab8 forgefriends is licensed under AGPLv3+
1 Like

Today’s rebasing took 10 minutes (36 new commits). There was a merge conflict because the README.md changed.


$ git describe gitea/main
v1.17.0-dev-700-gedf14202f
$ git log --oneline --no-merges gitea/main..origin/main
69a895a1e (HEAD -> main, origin/main, origin/feature-activitypub, feature-activitypub) activitypub: implement Repository
d97c8e042 activitypub: hack_16834
74ff002a4 activitypub: implement the ReqSignature middleware
e0d114cd1 activitypub: signing http client
e5363b9a8 activitypub: go-fed conformant Clock instance
3c1fcb672 activitypub: add the public key to Person (#14186)
e8fdeb68c activitypub: implement /api/v1/activitypub/user/{username} (#14186)
8555995d6 (origin/feature-projectbase, feature-projectbase) projectbase: implement tests for UpdateProjectBase
7c297b616 repo: add a .projectbase repository to each project
0e81c16a3 repository: cloneLink(suffix) instead of cloneLink(isWiki)
f63fe4dd5 (origin/feature-development-environment, feature-development-environment) gitignore: emacs backups
62357393b (origin/feature-go-fed, feature-go-fed) go.mod: add go-fed/{httpsig,activity/pub,activity/streams} dependency
07e6c651d (origin/feature-gitlab-ci, feature-gitlab-ci) tests: do not test against the GitHub API
2bc900a8d CI: unit tests for models race with each other and sometime fail
5aabd20e5 CI: setup GitLab CI
dce2e04dd (origin/feature-licensing, feature-licensing) forgefriends is licensed under AGPLv3+

Today’s rebasing took ~4 hours (60 new commits) because:


$ git describe gitea/main
v1.18.0-dev-9-ge91229eef
$ git log --oneline --no-merges gitea/main..origin/main
c4db14c1f (HEAD -> main, origin/main, origin/feature-projectbase, feature-projectbase) projectbase: implement tests for UpdateProjectBase
684179b1e repo: add a .projectbase repository to each project
a8e22a00f repository: cloneLink(suffix) instead of cloneLink(isWiki)
53b533d12 (origin/feature-fff, origin/base-fff, feature-fff, base-fff) gofff: replace Gitea migration
14aca726d tests: integration tests for the Gitea migration form
20433e847 gofff: get module
effe4fde9 gofff: lfs not implemented yet
f7df3052f gofff: remove the Gitea migration implementation
6d485b068 (origin/feature-development-environment, feature-development-environment) gitignore: emacs backups
f7507898f (origin/feature-gitlab-ci, feature-gitlab-ci) tests: do not test against the GitHub API
ce651af2d CI: unit tests for models race with each other and sometime fail
199007c32 CI: setup GitLab CI
a0def53c5 (origin/feature-licensing, feature-licensing) forgefriends is licensed under AGPLv3+

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

  • I was more careful than usual because the set of patches was reworked last week
  • A conflict needed to be resolved due to recent changes in integrations/mysql.ini.tmpl
  • The golangci-lint@v1.46.0 linter became more picky and caught two things in the fff integration that it did not like

$ git describe gitea/main
v1.18.0-dev-40-g1f7c717b5
$ git log --oneline --no-merges gitea/main..origin/main
280f23d7c (HEAD -> main, origin/main, origin/feature-projectbase, feature-projectbase) projectbase: implement tests for UpdateProjectBase
c9af588a4 repo: add a .projectbase repository to each project
af4323550 repository: cloneLink(suffix) instead of cloneLink(isWiki)
52e138964 (origin/feature-fff, origin/base-fff, feature-fff, base-fff) gofff: replace Gitea migration
827dbabed tests: integration tests for the Gitea migration form
9e05709bc gofff: get module
e33310c44 gofff: lfs not implemented yet
9c59531d2 gofff: remove the Gitea migration implementation
ba450c6ea (origin/feature-development-environment, feature-development-environment) gitignore: emacs backups
6ad41440b (origin/feature-gitlab-ci, feature-gitlab-ci) tests: do not test against the GitHub API
a58ca0161 CI: unit tests for models race with each other and sometime fail
28801bf8f CI: setup GitLab CI
45df3dcfa (origin/feature-licensing, feature-licensing) forgefriends is licensed under AGPLv3+

Today’s rebasing took ~15 minutes (19 new commits) because there was a conflict is files removed by the fff implementation.


$ git describe gitea/main
v1.18.0-dev-59-gf9b172db6
$ git log --oneline --no-merges gitea/main..origin/main
c4d90e598 (HEAD -> main, origin/main, origin/feature-projectbase, feature-projectbase) projectbase: implement tests for UpdateProjectBase
8927303e1 repo: add a .projectbase repository to each project
cdb37c482 repository: cloneLink(suffix) instead of cloneLink(isWiki)
df42dbd0b (origin/feature-fff, origin/base-fff, feature-fff, base-fff) gofff: replace Gitea migration
d4c411271 tests: integration tests for the Gitea migration form
af5f068a1 gofff: get module
6eaf57b90 gofff: lfs not implemented yet
dc13e92e7 gofff: remove the Gitea migration implementation
03a5a8c9c (origin/feature-development-environment, feature-development-environment) gitignore: emacs backups
7cfbc0c6b (origin/feature-gitlab-ci, feature-gitlab-ci) tests: do not test against the GitHub API
d208cc378 CI: unit tests for models race with each other and sometime fail
02f2ab1ed CI: setup GitLab CI
99b006a4e (origin/feature-licensing, feature-licensing) forgefriends is licensed under AGPLv3+

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+

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+

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+

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+

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+

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+

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+

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

Conflicts because of


$ 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+

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+

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+

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+

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+