Gaze/SpaceVim
1
0
Fork 0
mirror of https://github.com/SpaceVim/SpaceVim.git synced 2025-03-23 17:49:57 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
wsdjeg 2018-01-20 18:49:47 +08:00
commit 2e2c407e8e
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.SpaceVim.d/autoload/SpaceVim/dev/releases.vim
View File

@ -7,7 +7,7 @@ function! SpaceVim#dev#releases#open() abort
let is_dev = g:spacevim_version =~ 'dev' let is_dev = g:spacevim_version =~ 'dev'
let releases = { let releases = {
\ 'tag_name': (is_dev ? 'nightly' : g:spacevim_version), \ 'tag_name': (is_dev ? 'nightly' : g:spacevim_version),
\ 'target_commitish': 'dev', \ 'target_commitish': 'master',
\ 'name': (is_dev ? 'nightly' : 'SpaceVim v' . g:spacevim_version), \ 'name': (is_dev ? 'nightly' : 'SpaceVim v' . g:spacevim_version),
\ 'body': (is_dev ? s:body() : SpaceVim#dev#releases#content()), \ 'body': (is_dev ? s:body() : SpaceVim#dev#releases#content()),
\ 'draft': v:false, \ 'draft': v:false,

2
.ci/script.sh
View File

@ -10,7 +10,7 @@ elif [ "$LINT" = "vimlint-errors" ]; then
if [[ -f build_log ]]; then if [[ -f build_log ]]; then
rm build_log rm build_log
fi fi
for file in $(git diff --name-only HEAD dev | grep .vim$); for file in $(git diff --name-only HEAD master | grep .vim$);
do do
/tmp/vimlint/bin/vimlint.sh -E -l /tmp/vimlint -p /tmp/vimlparser $file >> build_log 2>&1; /tmp/vimlint/bin/vimlint.sh -E -l /tmp/vimlint -p /tmp/vimlparser $file >> build_log 2>&1;
done done

6
README.md
View File

@ -7,9 +7,9 @@
[Gitter **Chat**](https://gitter.im/SpaceVim/SpaceVim) \| [Gitter **Chat**](https://gitter.im/SpaceVim/SpaceVim) \|
[中文文档](http://spacevim.org/README_zh_cn/) [中文文档](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://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/dev?svg=true)](https://ci.appveyor.com/project/wsdjeg/spacevim/branch/dev) [![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/dev/graph/badge.svg)](https://codecov.io/gh/SpaceVim/SpaceVim/branch/dev) [![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) ![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) [![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) [![Doc](https://img.shields.io/badge/doc-%3Ah%20SpaceVim-orange.svg)](doc/SpaceVim.txt)

3
docs/development.md
View File

@ -86,7 +86,7 @@ PR = Pull-Request
##### Ideally for simple PRs (most of them): ##### Ideally for simple PRs (most of them):
- Branch from `dev` - Branch from `master`
- One topic per PR - One topic per PR
- One commit per PR - One commit per PR
- If you have several commits on different topics, close the PR and create one PR per topic - 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. 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. Those PRs are merged and explicitly not fast-forwarded.
Commit messages 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): Write commit messages according to adapted [Tim Pope’s guidelines](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html):