From f33dcac0431ca83a42e7e61072b48a955ce35b0f Mon Sep 17 00:00:00 2001 From: wsdjeg Date: Sat, 20 Jan 2018 15:45:48 +0800 Subject: [PATCH 1/4] Update development rules --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index e979dbd91..91706023c 100644 --- a/README.md +++ b/README.md @@ -7,9 +7,9 @@ [Gitter **Chat**](https://gitter.im/SpaceVim/SpaceVim) \| [中文文档](http://spacevim.org/README_zh_cn/) -[![Build Status](https://travis-ci.org/SpaceVim/SpaceVim.svg?branch=dev)](https://travis-ci.org/SpaceVim/SpaceVim) -[![Build status](https://ci.appveyor.com/api/projects/status/eh3t5oph70abp665/branch/dev?svg=true)](https://ci.appveyor.com/project/wsdjeg/spacevim/branch/dev) -[![codecov](https://codecov.io/gh/SpaceVim/SpaceVim/branch/dev/graph/badge.svg)](https://codecov.io/gh/SpaceVim/SpaceVim/branch/dev) +[![Build Status](https://travis-ci.org/SpaceVim/SpaceVim.svg?branch=master)](https://travis-ci.org/SpaceVim/SpaceVim) +[![Build status](https://ci.appveyor.com/api/projects/status/eh3t5oph70abp665/branch/master?svg=true)](https://ci.appveyor.com/project/wsdjeg/spacevim/branch/master) +[![codecov](https://codecov.io/gh/SpaceVim/SpaceVim/branch/master/graph/badge.svg)](https://codecov.io/gh/SpaceVim/SpaceVim/branch/master) ![Version](https://img.shields.io/badge/version-0.7.0--dev-FF00CC.svg) [![MIT License](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE) [![Doc](https://img.shields.io/badge/doc-%3Ah%20SpaceVim-orange.svg)](doc/SpaceVim.txt) From c58caa7b63c0e45c7e5a1f8ee2bbabc0d046c580 Mon Sep 17 00:00:00 2001 From: wsdjeg Date: Sat, 20 Jan 2018 15:58:40 +0800 Subject: [PATCH 2/4] Update release script use master branch as target branch --- .SpaceVim.d/autoload/SpaceVim/dev/releases.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.SpaceVim.d/autoload/SpaceVim/dev/releases.vim b/.SpaceVim.d/autoload/SpaceVim/dev/releases.vim index 591f1c491..7c8873581 100644 --- a/.SpaceVim.d/autoload/SpaceVim/dev/releases.vim +++ b/.SpaceVim.d/autoload/SpaceVim/dev/releases.vim @@ -7,7 +7,7 @@ function! SpaceVim#dev#releases#open() abort let is_dev = g:spacevim_version =~ 'dev' let releases = { \ 'tag_name': (is_dev ? 'nightly' : g:spacevim_version), - \ 'target_commitish': 'dev', + \ 'target_commitish': 'master', \ 'name': (is_dev ? 'nightly' : 'SpaceVim v' . g:spacevim_version), \ 'body': (is_dev ? s:body() : SpaceVim#dev#releases#content()), \ 'draft': v:false, From 17e1dd232c8dba0e30b37a9db4e947d4f37047c2 Mon Sep 17 00:00:00 2001 From: wsdjeg Date: Sat, 20 Jan 2018 16:27:14 +0800 Subject: [PATCH 3/4] Update script --- .ci/script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/script.sh b/.ci/script.sh index 4ae9e6e1d..17c8b61b4 100755 --- a/.ci/script.sh +++ b/.ci/script.sh @@ -10,7 +10,7 @@ elif [ "$LINT" = "vimlint-errors" ]; then if [[ -f build_log ]]; then rm build_log fi - for file in $(git diff --name-only HEAD dev | grep .vim$); + for file in $(git diff --name-only HEAD master | grep .vim$); do /tmp/vimlint/bin/vimlint.sh -E -l /tmp/vimlint -p /tmp/vimlparser $file >> build_log 2>&1; done From c0351b6a01959bac3aded45199ec6dfd7130b4a8 Mon Sep 17 00:00:00 2001 From: wsdjeg Date: Sat, 20 Jan 2018 16:39:54 +0800 Subject: [PATCH 4/4] Update dev doc --- docs/development.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/development.md b/docs/development.md index d0ed327fe..777d844b8 100644 --- a/docs/development.md +++ b/docs/development.md @@ -86,7 +86,7 @@ PR = Pull-Request ##### Ideally for simple PRs (most of them): -- Branch from `dev` +- Branch from `master` - One topic per PR - One commit per PR - If you have several commits on different topics, close the PR and create one PR per topic @@ -100,6 +100,7 @@ Those PRs are usually cherry-picked. Squash only the commits with uninteresting changes like typos, syntax fixes, etc… and keep the important and isolated steps in different commits. Those PRs are merged and explicitly not fast-forwarded. + Commit messages Write commit messages according to adapted [Tim Pope’s guidelines](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html):