Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
24
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Don't include vim temp-files in release tarball

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

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

12
RELEASE.md
View File

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

2
src/headless/converse-core.js
View File

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

1
webpack.html
View File

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