Browse Source

refine scrips

B. Petersen 4 months ago
parent
commit
d1f9dd6511
Signed by: B. Petersen (No account linked to committer's email)
2 changed files with 17 additions and 21 deletions
  1. 14
    19
      docs/release-checklist.md
  2. 3
    2
      tools/update-core.sh

+ 14
- 19
docs/release-checklist.md View File

@@ -2,18 +2,14 @@
2 2
 
3 3
 Release core, if needed, then:
4 4
 
5
-1. $ ./tools/update-core.sh OR
6
-    git checkout master
7
-    cd jni/messenger-backend/
8
-    git checkout master
9
-    git pull
10
-    cd ../..
11
-    git add jni/messenger-backend/
12
-    git commit -m "update messenger-backend submodule"
13
-
14
-2. $ tx pull # test and commit changes
15
-3. bump version, adapt changelog, commit, push
16
-4. deltachat-android on Github: "Draft a new release" with the version form `v1.2.3`
5
+1. $ git checkout master
6
+2. $ ./tools/update-core.sh if you're using symbolic links  OR
7
+   $ cd jni/messenger-backend/; git checkout master; git pull; cd ../..
8
+   $ git add jni/messenger-backend/
9
+   $ git commit -m "update messenger-backend submodule"
10
+3. $ tx pull # test and commit changes
11
+4. bump version, adapt changelog, commit, push
12
+5. deltachat-android on Github: "Draft a new release" with the version form `v1.2.3`
17 13
 
18 14
 ... some days later, F-Droid should be updated.
19 15
 
@@ -22,14 +18,14 @@ Release core, if needed, then:
22 18
 
23 19
 Release core, f-droid, then:
24 20
 
25
-5. make sure latest core is used: ndk-build
26
-6. In Android Studio, select "Build / Generate signed APK"
21
+1. make sure latest core is used: ndk-build
22
+2. In Android Studio, select "Build / Generate signed APK"
27 23
    (not: App Bundle as this would require uploading the signing key to Google)
28
-7. Select flavor `gplayRelease` with V1 signature enabled
24
+3. Select flavor `gplayRelease` with V1 signature enabled
29 25
    (needed for easy APK verificarion), V2 is optional
30
-8. Upload the generated APK from `gplay/release` to the Github release created at 4
31
-9. Test the APK
32
-10. Upload the APK to https://play.google.com/apps/publish/
26
+4. Upload the generated APK from `gplay/release` to the Github release created at 4
27
+5. Test the APK
28
+6. Upload the APK to https://play.google.com/apps/publish/
33 29
 
34 30
 
35 31
 # Testing checklist
@@ -44,4 +40,3 @@ that the test should be doable in, say, 10~15 minutes.
44 40
 - create a group
45 41
 - do a contact verification
46 42
 - join a group via a qr scan
47
-

+ 3
- 2
tools/update-core.sh View File

@@ -20,10 +20,11 @@ git submodule update --init --recursive
20 20
 cd jni/messenger-backend
21 21
 git checkout master
22 22
 git pull
23
+cd ../..
23 24
 
24 25
 # commit changes
25
-cd ../..
26
-git commit -am "Update messenger-backend submodule."
26
+git add jni/messenger-backend/
27
+git commit -m "Update messenger-backend submodule."
27 28
 
28 29
 # remove files downloaded just  for committing
29 30
 rm -r jni/messenger-backend/*