search

aashishksahu / SafeSpace

A safe place for your valuable information
GNU General Public License v3.0
144 stars 9 forks source link

F-Droid can't build #32

Closed licaon-kter closed 5 days ago

licaon-kter commented 5 months ago

... can you decide on one tag naming format and keep it consistent instead of changing it every other release? :(

https://github.com/aashishksahu/SafeSpace/tree/1.2.2

https://github.com/aashishksahu/SafeSpace/tree/v1.3.0

https://github.com/aashishksahu/SafeSpace/tree/1.4.1

so it's v or no v ?

ref: https://gitlab.com/fdroid/fdroiddata/-/jobs/5975788746#L353

I've updated it now manually

aashishksahu commented 5 months ago

@licaon-kter my apologies, it's no v. I might have made a mistake with 1.3.0. Thanks for updating.

licaon-kter commented 5 months ago

Thanks

licaon-kter commented 4 months ago

non repro: https://monitor.f-droid.org/builds/log/org.privacymatters.safespace/17#site-footer

/LE: fyi https://gitlab.com/fdroid/fdroiddata/-/commit/ae5e8a3923acee7cfde25b58fb65ea501099910f

will get a diff log asap

aashishksahu commented 4 months ago

Hi @licaon-kter, is there an issue with the build?

licaon-kter commented 4 months ago

Yes, see first link, APK is not reproducible

aashishksahu commented 4 months ago

@licaon-kter any suggestions on how this can be fixed? I haven't done any changes to the build.gradle file besides the app version numbers and dependencies.

licaon-kter commented 4 months ago

The only difference is:

│ │ │ │ │   --- safe-space-v1.4.3/smali_classes2/org/privacymatters/safespace/BuildConfig.smali                                
│ │ │ │ ├── +++ org.privacymatters.safespace_17/smali_classes2/org/privacymatters/safespace/BuildConfig.smali                  
│ │ │ │ │ @@ -6,17 +6,17 @@                                                                                                    
│ │ │ │ │  # static fields                                                                                                     
│ │ │ │ │  .field public static final APPLICATION_ID:Ljava/lang/String; = "org.privacymatters.safespace"                       
│ │ │ │ │                                                                                                                      
│ │ │ │ │  .field public static final BUILD_TYPE:Ljava/lang/String; = "release"                                                
│ │ │ │ │                                                                                                                      
│ │ │ │ │  .field public static final DEBUG:Z = false                                                                          
│ │ │ │ │                                                                                                                      
│ │ │ │ │ -.field public static final VERSION_CODE:I = 0x10                                                                    
│ │ │ │ │ +.field public static final VERSION_CODE:I = 0x11                                                                    
│ │ │ │ │                                                                                                                      
│ │ │ │ │ -.field public static final VERSION_NAME:Ljava/lang/String; = "1.4.2"                                                
│ │ │ │ │ +.field public static final VERSION_NAME:Ljava/lang/String; = "1.4.3"                                                
│ │ │ │ │                                                                                                                      
│ │ │ │ │                                                                                                                      
│ │ │ │ │  # direct methods                                                                                                    
│ │ │ │ │  .method public constructor <init>()V                                                                                
│ │ │ │ │      .locals 0                                                                                                       
│ │ │ │ │                                                                                                                      
│ │ │ │ │      .line 6

which looks easy to fix, right?

Looks like you build before bumping version https://github.com/aashishksahu/SafeSpace/commit/848083dd7c064b5d8989be903627a0595861c1cc#diff-51a0b488f963eb0be6c6599bf5df497313877cf5bdff3950807373912ac1cdc9R20

Can you rebuild from https://github.com/aashishksahu/SafeSpace/commit/006e9685cc92ab622a547eb8067a85eefefdd8ea and replace the APK for me to test?

aashishksahu commented 4 months ago

I have uploaded a new apk in the same 1.4.3 tag

licaon-kter commented 4 months ago

This one checks out: https://gitlab.com/fdroid/fdroiddata/-/commit/d34076821ed1f7b9649519ed706c3142271982a7 :tada:

What did you change?

aashishksahu commented 4 months ago

Nothing, just rebuilt the apk..

licaon-kter commented 2 months ago

https://github.com/aashishksahu/SafeSpace/releases/tag/1.4.8 points to https://github.com/aashishksahu/SafeSpace/commit/1a2d5a71e2f233ed214a32a30e15f85a5ccea94a

But you've built the APK from https://github.com/aashishksahu/SafeSpace/commit/86f4f71bbd590fcaa7fbb4b6eb6086018120ee2c ?

ref: https://monitor.f-droid.org/builds/log/org.privacymatters.safespace/22#site-footer

/LE: fyi https://gitlab.com/fdroid/fdroiddata/-/commit/f5e0ddaa9c65f88e28c0bb2f50e7851694eb15ae

aashishksahu commented 2 months ago

Rebuilt the apk.

licaon-kter commented 2 months ago

thanks, https://gitlab.com/fdroid/fdroiddata/-/commit/8d17e6136939ad9100967f44a033ff789c6a8251

licaon-kter commented 1 week ago

Please upload the release APK built from the tagged commit, not from your working local tree: https://gitlab.com/fdroid/fdroiddata/-/jobs/7268389326#L3019

So build now from e707d909897f4c319fa26282e5aeca80b7c7f517 and update the APK in https://github.com/aashishksahu/SafeSpace/releases/tag/2.0.2

aashishksahu commented 1 week ago

Hi @licaon-kter I have updated the release. Since this has happened many times, what is the general instruction for release build? Is my understanding correct that I have to build from the latest commit of origin/master?

licaon-kter commented 1 week ago

I understand that devs test their commits, as expected, but, please upload official release APKs built from the tagged commits and not your local test APK. :)

aashishksahu commented 1 week ago

Alright, got your point, thanks :)

licaon-kter commented 1 week ago 
...
more stuff diff
...
diff -r /tmp/tmpsxxjbf2r/unsigned_binaries_org.privacymatters.safespace_33.binary/content/META-INF/com/android/build/gradle/app-metadata.properties /tmp/tmpsxxjbf2r/unsigned_org.privacymatters.safespace_33/content/META-INF/com/android/build/gradle/app-metadata.properties
2c2
< androidGradlePluginVersion=8.5.0
---
> androidGradlePluginVersion=8.4.1
Binary files /tmp/tmpsxxjbf2r/unsigned_binaries_org.privacymatters.safespace_33.binary/content/assets/dexopt/baseline.prof and /tmp/tmpsxxjbf2r/unsigned_org.privacymatters.safespace_33/content/assets/dexopt/baseline.prof differ
Binary files /tmp/tmpsxxjbf2r/unsigned_binaries_org.privacymatters.safespace_33.binary/content/assets/dexopt/baseline.profm and /tmp/tmpsxxjbf2r/unsigned_org.privacymatters.safespace_33/content/assets/dexopt/baseline.profm differ
Binary files /tmp/tmpsxxjbf2r/unsigned_binaries_org.privacymatters.safespace_33.binary/content/classes.dex and /tmp/tmpsxxjbf2r/unsigned_org.privacymatters.safespace_33/content/classes.dex differ
Binary files /tmp/tmpsxxjbf2r/unsigned_binaries_org.privacymatters.safespace_33.binary/content/classes2.dex and /tmp/tmpsxxjbf2r/unsigned_org.privacymatters.safespace_33/content/classes2.dex differ
Binary files /tmp/tmpsxxjbf2r/unsigned_binaries_org.privacymatters.safespace_33.binary/content/classes3.dex and /tmp/tmpsxxjbf2r/unsigned_org.privacymatters.safespace_33/content/classes3.dex differ
diff -r /tmp/tmpsxxjbf2r/unsigned_binaries_org.privacymatters.safespace_33.binary/content/kotlin-tooling-metadata.json /tmp/tmpsxxjbf2r/unsigned_org.privacymatters.safespace_33/content/kotlin-tooling-metadata.json
4c4
<   "buildSystemVersion": "8.7",
---
>   "buildSystemVersion": "8.6",

can you clean cache (all maven and gradle tooling and stuff) and rebuild?

/LE: fyi https://gitlab.com/fdroid/fdroiddata/-/commit/c2fe9be8dc536326168e583f640188d00ef31b66

aashishksahu commented 5 days ago

Hey @licaon-kter. I have released a new version, please let me know if there's any issue after the build job picks it up.

licaon-kter commented 5 days ago

confirmed, thanks https://gitlab.com/fdroid/fdroiddata/-/commit/380aff1c820a27fda884b396c5adda60231b98d4