ci: Use fdroidserver patch for publish workflow

[provokateurin]

#18

To test out the patch https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1511 made by @wrenix

[wrenix]

Damit, that would be to easy

[provokateurin]

I'm not sure if the remaining problem is related to the first problem or not

[wrenix]

I am not sure, i believe the ignoriering of stats folder (like in my patch) is related to something that happens before. That the .apk files are not detected.

I am more or less just a user of fdroid. I have use that fdroidserver just for nightly three years ago .... So have no clue. And believe it should dive into a big code review, now. I do not know if I would do that.

[provokateurin]

Makes sense. Thanks for the patch btw 👍

[wrenix]

Found this different between last success and last failure:

 DEBUG: adding IdentityFile to /home/runner/.ssh/config
 DEBUG: Reading 'config.yml'
 DEBUG: ipfs_cid not found, skipping CIDv1 generation
 DEBUG: Stripping mystery signature from /home/runner/work/neon/neon/app-armeabi-v7a-debug.apk
 DEBUG: Resigning app-armeabi-v7a-debug.apk with provided debug.keystore
 DEBUG: > /usr/bin/apksigner sign --ks /home/runner/.***/debug.keystore --ks-pass env:FDROID_KEY_STORE_PASS --key-pass env:FDROID_KEY_PASS --ks-key-alias *** --in /home/runner/work/neon/neon/app-armeabi-v7a-debug.apk --out /home/runner/work/neon/neon/fdroid/repo/app-armeabi-v7a-debug.apk
+DEBUG: Stripping mystery signature from /home/runner/work/neon/neon/app-arm64-v8a-debug.apk
+DEBUG: Resigning app-arm64-v8a-debug.apk with provided debug.keystore
+DEBUG: > /usr/bin/apksigner sign --ks /home/runner/.***/debug.keystore --ks-pass env:FDROID_KEY_STORE_PASS --key-pass env:FDROID_KEY_PASS --ks-key-alias *** --in /home/runner/work/neon/neon/app-arm64-v8a-debug.apk --out /home/runner/work/neon/neon/fdroid/repo/app-arm64-v8a-debug.apk
 DEBUG: Stripping mystery signature from /home/runner/work/neon/neon/app-x86_64-debug.apk
 DEBUG: Resigning app-x86_64-debug.apk with provided debug.keystore
 DEBUG: > /usr/bin/apksigner sign --ks /home/runner/.***/debug.keystore --ks-pass env:FDROID_KEY_STORE_PASS --key-pass env:FDROID_KEY_PASS --ks-key-alias *** --in /home/runner/work/neon/neon/app-x86_64-debug.apk --out /home/runner/work/neon/neon/fdroid/repo/app-x86_64-debug.apk
-DEBUG: Stripping mystery signature from /home/runner/work/neon/neon/app-arm64-v8a-debug.apk
+DEBUG: Stripping mystery signature from /home/runner/work/neon/neon/fdroid/repo/app-armeabi-v7a-debug.apk
+DEBUG: Resigning app-armeabi-v7a-debug.apk with provided debug.keystore
+DEBUG: > /usr/bin/apksigner sign --ks /home/runner/.***/debug.keystore --ks-pass env:FDROID_KEY_STORE_PASS --key-pass env:FDROID_KEY_PASS --ks-key-alias *** --in /home/runner/work/neon/neon/fdroid/repo/app-armeabi-v7a-debug.apk --out /home/runner/work/neon/neon/fdroid/repo/app-armeabi-v7a-debug.apk
+DEBUG: Stripping mystery signature from /home/runner/work/neon/neon/fdroid/repo/app-arm64-v8a-debug.apk
 DEBUG: Resigning app-arm64-v8a-debug.apk with provided debug.keystore
-DEBUG: > /usr/bin/apksigner sign --ks /home/runner/.***/debug.keystore --ks-pass env:FDROID_KEY_STORE_PASS --key-pass env:FDROID_KEY_PASS --ks-key-alias *** --in /home/runner/work/neon/neon/app-arm64-v8a-debug.apk --out /home/runner/work/neon/neon/fdroid/repo/app-arm64-v8a-debug.apk
+DEBUG: > /usr/bin/apksigner sign --ks /home/runner/.***/debug.keystore --ks-pass env:FDROID_KEY_STORE_PASS --key-pass env:FDROID_KEY_PASS --ks-key-alias *** --in /home/runner/work/neon/neon/fdroid/repo/app-arm64-v8a-debug.apk --out /home/runner/work/neon/neon/fdroid/repo/app-arm64-v8a-debug.apk
+DEBUG: Stripping mystery signature from /home/runner/work/neon/neon/fdroid/repo/app-x86_64-debug.apk
+DEBUG: Resigning app-x86_64-debug.apk with provided debug.keystore
+DEBUG: > /usr/bin/apksigner sign --ks /home/runner/.***/debug.keystore --ks-pass env:FDROID_KEY_STORE_PASS --key-pass env:FDROID_KEY_PASS --ks-key-alias *** --in /home/runner/work/neon/neon/fdroid/repo/app-x86_64-debug.apk --out /home/runner/work/neon/neon/fdroid/repo/app-x86_64-debug.apk

Looks for me like duplicated signing is added, where the second has the problem with same input than output.

E.g. --in /home/runner/work/neon/neon/fdroid/repo/app-x86_64-debug.apk --out /home/runner/work/neon/neon/fdroid/repo/app-x86_64-debug.apk

Maybe that is the problem.

[provokateurin]

I doubt it, it says it is resigning the files. I also wouldn't know why this would cause the files to be missing.

[wrenix]

I do. Is it okay to run some tests?

I believe, that the in of fdroid/repo should not happen and that code prevent it (but does not work anymore):

if d == 'fdroid' and root == cibase:
  dirs.remove(d)

see
https://gitlab.com/fdroid/fdroidserver/-/blob/master/fdroidserver/nightly.py?ref_type=heads#L435