Don't include vim temp-files in release tarball

and bump post-release version number
This commit is contained in:
JC Brand 2020-01-10 13:04:05 +01:00
parent 7d94c712c8
commit e866248227
4 changed files with 13 additions and 7 deletions

View File

@ -62,6 +62,10 @@ serve: stamp-npm
serve_bg: stamp-npm
$(HTTPSERVE) -p $(HTTPSERVE_PORT) -c-1 -s &
.PHONY: notemps
notemps:
find -name "*~" -exec rm {} \;
########################################################################
## Translation machinery
@ -98,6 +102,7 @@ release:
make pot
make po
make build
make notemps
npm pack
.PHONY: postrelease

View File

@ -1,18 +1,18 @@
# Release checklist
1. Run `make check` to check that all tests pass.
2. Run `make release VERSION=6.0.0`
2. Run `make release VERSION=6.0.1`
3. Do a `git diff` to check if things look sane.
4. Do a quick manual test with the `dist` files (via `index.html`)
5. `git commit -am "Release 6.0.0"`
6. `git tag -s v6.0.0 -m "Release 6.0.0"`
5. `git commit -am "Release 6.0.1"`
6. `git tag -s v6.0.1 -m "Release 6.0.1"`
7. Run `git push && git push --tags`
8. Update https://conversejs.org
* `cd /home/conversejs/converse.js`
* `git clone --branch v6.0.0 git@github.com:conversejs/converse.js.git 6.0.0`
* `cd 6.0.0 && ASSET_PATH=https://cdn.conversejs.org/6.0.0/dist/ make dist`
* `git clone --branch v6.0.1 git@github.com:conversejs/converse.js.git 6.0.1`
* `cd 6.0.1 && ASSET_PATH=https://cdn.conversejs.org/6.0.1/dist/ make dist`
* `cd .. && git pull && ASSET_PATH=https://cdn.conversejs.org/dist/ make dist`
9. Update release page on Github
11. Run `npm publish && cd src/headless/ && npm publish`
12. Update the repository on weblate
13. Decide on next release number and run `make postrelease VERSION=6.0.1`
13. Decide on next release number and run `make postrelease VERSION=6.0.2`

View File

@ -112,7 +112,7 @@ const _converse = {
'promises': {}
}
_converse.VERSION_NAME = "v6.0.0";
_converse.VERSION_NAME = "v6.0.1dev";
Object.assign(_converse, Backbone.Events);

View File

@ -18,6 +18,7 @@
}
});
converse.initialize({
show_send_button: true,
auto_away: 300,
auto_register_muc_nickname: true,
loglevel: 'debug',