Skip to content

Commit 412c061

Browse files
committed
Update release process
1 parent 32c6083 commit 412c061

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

.github/CONTRIBUTING.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,8 @@ make test && make integration-test-docker
3333
```sh
3434
make test && make integration-test
3535
```
36+
37+
# Submit PR
38+
39+
Please submit pull request to `dev` branch. This is to avoid mismatch between
40+
vimscript and rust binary run by end user.

Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ edition = "2018"
1010
no-dev-version = true
1111
pre-release-replacements = [
1212
{ file = "install.sh", search = "\nversion=.*", replace = "\nversion={{version}}" },
13-
{ file = "install.ps1", search = "version = '.*'", replace = "version = '{{version}}'" }
13+
{ file = "install.ps1", search = "version = '.*'", replace = "version = '{{version}}'" },
14+
{ file = "CHANGELOG.md", search = "Unreleased", replace = "{{version}}" },
1415
]
1516
pre-release-hook = ["cargo", "build"]
1617
tag-name = "{{version}}"

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ release:
2828
chmod a+x bin/languageclient
2929

3030
bump-version:
31-
[[ `git rev-parse --abbrev-ref HEAD` == "next" ]] || (echo "Not on branch next"; exit 1)
31+
[[ `git rev-parse --abbrev-ref HEAD` == "dev" ]] || (echo "Not on branch dev"; exit 1)
3232
cargo release patch
3333

3434
test:

0 commit comments

Comments
 (0)