21 Apr 2021 |
jochensp | force-with-lease is a good idea in general, you could have multiple clones as a single user or do something in the web interface or... | 10:34:50 |
| @freenode_kempe:matrix.org left the room. | 12:02:51 |
| @freenode_kempe:matrix.org joined the room. | 12:03:13 |
jochensp | _hc: https://monitor.f-droid.org/builds/log/org.fdroid.fdroid/1013000 | 15:34:49 |
_hc | thanks, I'm aware | 15:35:45 |
| _hc joined the room. | 16:12:02 |
@freenode_izzy:matrix.org | <how should git now that you didn't clone the upstream first?> Exactly. That's why I always thing of "origin" as "where this fork originates" – and "upstream" as "where origin comes from, further up the stream" :D | 16:30:38 |
@freenode_izzy:matrix.org | s/thing/think/ | 16:30:50 |
| @freenode_kempe:matrix.org left the room. | 17:15:37 |
@1hiking:privacytools.io | Sounds like somebody needs S edbot here :^) | 17:41:38 |
| @freenode_kempe:matrix.org joined the room. | 18:15:19 |
@obfusk:matrix.org | izzy: that's how I use "origin" & "upstream" as well. | 18:29:20 |
@freenode_izzy:matrix.org | Meets my logic :) | 18:36:28 |
cdesai | I name my own remotes cd / cd-priv (for push/ssh), and upstream is usually upstream | 18:49:17 |
@obfusk:matrix.org | Does anyone have a clue what's causing this error in the CI for my MR? https://gitlab.com/obfusk/fdroiddata/-/jobs/1200862941#L7006 | 21:12:04 |
jochensp | 幸猫: https://stackoverflow.com/questions/46402772/failed-to-install-android-sdk-java-lang-noclassdeffounderror-javax-xml-bind-a maybe? | 21:15:23 |
jochensp | try a newer NDK | 21:16:10 |
jochensp | ..or SDK | 21:16:33 |
@obfusk:matrix.org | jochensp: I'm using the latest ndk (needed for reproducible builds). and afaik the sdk is provided by the build server. | 21:25:06 |
@obfusk:matrix.org | seems the installed sdk doesn't like java 11. | 21:28:32 |
jochensp | yes | 21:29:23 |
@obfusk:matrix.org | removing the installed sdk would probably work since buildozer will install one. is that considered acceptable? | 21:31:17 |
jochensp | probably not for the F-Droid repo | 21:35:20 |
@obfusk:matrix.org | any other suggestions? | 21:37:47 |
jochensp | use an older jdk | 21:38:25 |
@obfusk:matrix.org | thought of that :) but my own builds are on buster, which doesn't have openjdk 8. and fdroidserver can't exactly keep using stretch in the future. | 21:42:59 |
@obfusk:matrix.org | is there an acceptable way to install a newer sdk? | 21:44:26 |
jochensp | maybe it is related to this: https://gitlab.com/fdroid/fdroidserver/-/blob/master/makebuildserver#L163 | 21:45:09 |
@obfusk:matrix.org | probably. I'm pretty sure I don't need "android update project" though. | 21:50:39 |
22 Apr 2021 |
_hc | cdesai: FYI you can set http/ssh URLs for the same remote: | 06:16:13 |