20170310_jeffrey - silenceuncrio/diary GitHub Wiki
0830
ไปๅคฉ่ฆๆบๅ release M300 ็ V1.2 ็
็ญ aaron ไพๅ่ชชๅง
1005
็
ง่ M300 Wiki ็ M300 release procedure ่ตฐไธๆฌก
โ M300 git:(develop) git flow init
Already initialized for gitflow.
To force reinitialization, use: git flow init -f
โ M300 git:(develop) git flow release start v1.2
Switched to a new branch 'release/v1.2'
Summary of actions:
- A new branch 'release/v1.2' was created, based on 'develop'
- You are now on branch 'release/v1.2'
Follow-up actions:
- Bump the version number now!
- Start committing last-minute fixes in preparing your release
- When done, run:
git flow release finish 'v1.2'
โ M300 git:(release/v1.2) git flow release finish v1.2
Branches 'master' and 'origin/master' have diverged.
And branch 'master' may be fast-forwarded.
ๆ็ master branch ้่ฆๅ ๅพ git server pull ๆๆฐ็ code
โ M300 git:(release/v1.2) git checkout master
Switched to branch 'master'
Your branch is behind 'origin/master' by 138 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)
โ M300 git:(master) โ git pull
First, rewinding head to replay your work on top of it...
Fast-forwarded master to d02739431c5258883398f3cfe2714b74d077badd.
ๅๅๅ release/v1.2 ็นผ็บ
โ M300 git:(master) โ git checkout release/v1.2
Switched to branch 'release/v1.2'
โ M300 git:(release/v1.2) git flow release finish v1.2
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.
Auto-merging proscend/prosrc/www/index.html.src
Removing proscend/prosrc/www/app/locale-de.json
Removing proscend/prosrc/www/app/locale-ar.json
Removing proscend/prosrc/icos/script/DhclientVifOnOff.sh
Removing proscend/prosrc/icos/icoslib/lte/utf8.h
Removing proscend/prosrc/icos/icoslib/lte/utf8.c
Merge made by the 'recursive' strategy.
README.md | 27 +-
meta-proscend/classes/image_types_proscend.bbclass | 16 +
meta-proscend/recipes-bsp/u-boot/files/uboot_env_v1.0.patch | 69 +
...
Deleted branch release/v1.2 (was cb8020c).
Summary of actions:
- Latest objects have been fetched from 'origin'
- Release branch has been merged into 'master'
- The release was tagged 'v1.2'
- Release branch has been back-merged into 'develop'
- Release branch 'release/v1.2' has been deleted
็นผ็บ
โ M300 git:(master) git push
warning: push.default is unset; its implicit value has changed in
Git 2.0 from 'matching' to 'simple'. To squelch this message
and maintain the traditional behavior, use:
git config --global push.default matching
To squelch this message and adopt the new behavior now, use:
git config --global push.default simple
When push.default is set to 'matching', git will push local branches
to the remote branches that already exist with the same name.
Since Git 2.0, Git defaults to the more conservative 'simple'
behavior, which only pushes the current branch to the corresponding
remote branch that 'git pull' uses to update the current branch.
See 'git help config' and search for 'push.default' for further information.
(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode
'current' instead of 'simple' if you sometimes use older versions of Git)
Counting objects: 1, done.
Writing objects: 100% (1/1), 222 bytes | 0 bytes/s, done.
Total 1 (delta 0), reused 0 (delta 0)
To [email protected]:RD/M300.git
d027394..fd5de6f master -> master
็ไธไธ็ฎๅ็ tag
โ M300 git:(master) git tag
v1.0
v1.1
v1.2
ๆ tag push ไธๅป
โ M300 git:(master) git push --tags
Counting objects: 2, done.
Compressing objects: 100% (2/2), done.
Writing objects: 100% (2/2), 1002 bytes | 0 bytes/s, done.
Total 2 (delta 0), reused 0 (delta 0)
To [email protected]:RD/M300.git
* [new tag] v1.2 -> v1.2
! [rejected] v1.0 -> v1.0 (already exists)
error: failed to push some refs to '[email protected]:RD/M300.git'
hint: Updates were rejected because the tag already exists in the remote.
ไธ็ฅ้็บไป้บผๅบ็พ ! [rejected] v1.0 -> v1.0 (already exists)
็ฎๅ้ฒ่กๅฐ้ๅ้ๆฎต็่ซไธ git server ๆ่งธ็ผ M300 ็ daily build server ้ๅง้ฒ่ก็ทจ่ญฏ็ๅไฝๆๅฐ
aaron ๅนซๅฟ็ไธไธๅ้ก
1030
็ฎๅ daily build server ๅทฒ็ถๅจ build code ไบ
1435
็ตๆผ้ ๅฉ้ฒ่กไบ release