search

stripe / stripe-android

Stripe Android SDK
https://stripe.com/docs/mobile/android
MIT License
1.29k stars 648 forks source link

Remove --tag flag from tag push command #9492

Closed amk-stripe closed 3 weeks ago

amk-stripe commented 3 weeks ago

Summary

Remove --tag flag from tag push command

Motivation

Fixes an issue during our release where pushing the release's tag will fail if another conflicting tag is present locally.

Testing

I have some local conflicting tags. I ran the old command and it failed:

amk$ git push --tag origin 20.90.0
Enumerating objects: 2, done.
Counting objects: 100% (2/2), done.
Delta compression using up to 10 threads
Compressing objects: 100% (2/2), done.
Writing objects: 100% (2/2), 669 bytes | 669.00 KiB/s, done.
Total 2 (delta 0), reused 1 (delta 0), pack-reused 0 (from 0)
To github.com:stripe/stripe-android.git
 * [new tag]               20.90.0 -> 20.90.0
 ! [rejected]              v20.49.0 -> v20.49.0 (already exists)
error: failed to push some refs to 'github.com:stripe/stripe-android.git'
hint: Updates were rejected because the tag already exists in the remote.

I ran with the new command and it succeeded:

amk$ git push origin 20.90.0
Everything up-to-date

Verified that it succeeded by seeing that it showed up in our repo tags (but then I deleted it because it was useless!)

github-actions[bot] commented 3 weeks ago

Diffuse output:

OLD: identity-example-release-base.apk (signature: V1, V2)
NEW: identity-example-release-pr.apk (signature: V1, V2)

          │          compressed          │         uncompressed         
          ├───────────┬───────────┬──────┼───────────┬───────────┬──────
 APK      │ old       │ new       │ diff │ old       │ new       │ diff 
──────────┼───────────┼───────────┼──────┼───────────┼───────────┼──────
      dex │     2 MiB │     2 MiB │  0 B │   4.1 MiB │   4.1 MiB │  0 B 
     arsc │     1 MiB │     1 MiB │  0 B │     1 MiB │     1 MiB │  0 B 
 manifest │   2.3 KiB │   2.3 KiB │  0 B │     8 KiB │     8 KiB │  0 B 
      res │ 301.8 KiB │ 301.8 KiB │  0 B │ 455.5 KiB │ 455.5 KiB │  0 B 
   native │   6.2 MiB │   6.2 MiB │  0 B │  15.8 MiB │  15.8 MiB │  0 B 
    asset │   7.1 KiB │   7.1 KiB │  0 B │   6.8 KiB │   6.8 KiB │  0 B 
    other │    90 KiB │  89.9 KiB │ -5 B │ 170.1 KiB │ 170.1 KiB │  0 B 
──────────┼───────────┼───────────┼──────┼───────────┼───────────┼──────
    total │   9.6 MiB │   9.6 MiB │ -5 B │  21.5 MiB │  21.5 MiB │  0 B 

 DEX     │ old   │ new   │ diff      
─────────┼───────┼───────┼───────────
   files │     1 │     1 │ 0         
 strings │ 19994 │ 19994 │ 0 (+0 -0) 
   types │  6179 │  6179 │ 0 (+0 -0) 
 classes │  4973 │  4973 │ 0 (+0 -0) 
 methods │ 29965 │ 29965 │ 0 (+0 -0) 
  fields │ 17503 │ 17503 │ 0 (+0 -0) 

 ARSC    │ old  │ new  │ diff 
─────────┼──────┼──────┼──────
 configs │  164 │  164 │  0   
 entries │ 3622 │ 3622 │  0
APK ``` compressed │ uncompressed │ ──────────┬──────┼───────────┬──────┤ size │ diff │ size │ diff │ path ──────────┼──────┼───────────┼──────┼─────────────────────────────────────────── 28.4 KiB │ -4 B │ 62.8 KiB │ 0 B │ ∆ META-INF/CERT.SF 270 B │ -2 B │ 120 B │ 0 B │ ∆ META-INF/version-control-info.textproto 1.2 KiB │ +2 B │ 1.2 KiB │ 0 B │ ∆ META-INF/CERT.RSA 25.2 KiB │ -1 B │ 62.7 KiB │ 0 B │ ∆ META-INF/MANIFEST.MF ──────────┼──────┼───────────┼──────┼─────────────────────────────────────────── 55.1 KiB │ -5 B │ 126.8 KiB │ 0 B │ (total) ```