Ver código fonte

make tracking core versions easier (#1406)

* nicer commit messasge on updating core

* add a hint to release checklist to include the used core version
bjoern 3 anos atrás
pai
commit
14967caba8
2 arquivos alterados com 8 adições e 7 exclusões
  1. 6 6
      docs/release-checklist.md
  2. 2 1
      scripts/update-core.sh

+ 6 - 6
docs/release-checklist.md

@@ -13,12 +13,12 @@ on the command-line:
 3. update local help:
 3. update local help:
    $ ./scripts/create-local-help.py
    $ ./scripts/create-local-help.py
 
 
-4. add a device message to ChatListController::viewWillAppear()
-   and update CHANGELOG.md
-   (the core-changelog at
-   https://github.com/deltachat/deltachat-core-rust/blob/master/CHANGELOG.md
-   and the "N commits to master since last release" on
-   https://github.com/deltachat/deltachat-ios/releases gives some good hints)
+4. a) update CHANGELOG.md
+      from https://github.com/deltachat/deltachat-core-rust/blob/master/CHANGELOG.md
+      and https://github.com/deltachat/deltachat-ios/pulls?q=is%3Apr+is%3Aclosed+sort%3Aupdated-desc
+   b) add used core version to CHANGELOG.md
+   c) add a device message to ConversationListActivity::onCreate()
+      or remove the old one
 
 
 in Xcode:
 in Xcode:
 
 

+ 2 - 1
scripts/update-core.sh

@@ -12,11 +12,12 @@ git submodule update --init --recursive
 cd deltachat-ios/libraries/deltachat-core-rust
 cd deltachat-ios/libraries/deltachat-core-rust
 git checkout master
 git checkout master
 git pull
 git pull
+commitmsg=`git log -1 --pretty=%s`
 cd ../../..
 cd ../../..
 
 
 # commit changes
 # commit changes
 git add deltachat-ios/libraries/deltachat-core-rust
 git add deltachat-ios/libraries/deltachat-core-rust
-git commit -m "update deltachat-core-rust submodule"
+git commit -m "update deltachat-core-rust submodule to '$commitmsg'"
 
 
 echo "changes are commited to local repo."
 echo "changes are commited to local repo."
 echo "use 'git push' to use them or 'git reset HEAD~1; git submodule update --recursive' to abort on your own risk :)"
 echo "use 'git push' to use them or 'git reset HEAD~1; git submodule update --recursive' to abort on your own risk :)"