diff options
author | Maxence Lange <maxence@artificial-owl.com> | 2021-07-01 14:59:50 +0300 |
---|---|---|
committer | Maxence Lange <maxence@artificial-owl.com> | 2021-07-01 14:59:50 +0300 |
commit | e912dd896eec91dbeba414095e47ba6d5b313abe (patch) | |
tree | 8ae089b347233f96e1fd8965ea12c799e882016d | |
parent | 16d41f0634f47bf9a5e01c9ebd8f077e7b3a335d (diff) |
0.20.100.20.10
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
-rw-r--r-- | CHANGELOG.md | 6 | ||||
-rw-r--r-- | Makefile | 73 | ||||
-rw-r--r-- | appinfo/info.xml | 2 |
3 files changed, 62 insertions, 19 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 1938dd13..c2082910 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog + +### 0.20.10 + +- escape html in 'shared files by Circles' + + ### 0.20.9 - fix a conflict with 3rd parties app @@ -1,34 +1,69 @@ -app_name=circles +app_name=Circles build_dir=$(CURDIR)/build/artifacts appstore_dir=$(build_dir)/appstore source_dir=$(build_dir)/source sign_dir=$(build_dir)/sign -package_name=$(app_name) +package_name=$(shell echo $(app_name) | tr '[:upper:]' '[:lower:]') cert_dir=$(HOME)/.nextcloud/certificates github_account=nextcloud +release_account=nextcloud-releases branch=stable20 -version+=0.20.9 +version=0.20.10 +since_tag= all: appstore release: appstore github-release github-upload github-release: + if [ -z "$(release_account)" ]; then \ + release_account=$(github_account); \ + release_branch=$(branch); \ + else \ + release_account=$(release_account); \ + release_branch=master; \ + fi; \ + if [ -z "$(since_tag)" ]; then \ + latest_tag=$$(git describe --tags `git rev-list --tags --max-count=1`); \ + else \ + latest_tag=$(since_tag); \ + fi; \ + comparison="$$latest_tag..HEAD"; \ + if [ -z "$$latest_tag" ]; then comparison=""; fi; \ + changelog=$$(git log $$comparison --oneline --no-merges | sed -e 's/^/$(github_account)\/$(package_name)@/'); \ github-release release \ - --user $(github_account) \ - --repo $(app_name) \ - --target $(branch) \ - --tag v$(version) \ - --name "$(app_name) v$(version)" + --user $$release_account \ + --repo $(package_name) \ + --target $$release_branch \ + --tag $(version) \ + --description "**Changelog**<br/>$$changelog" \ + --name "$(app_name) v$(version)"; \ + if [ $(github_account) != $$release_account ]; then \ + link="https://github.com/$$release_account/$(package_name)/releases/download/$(version)/$(package_name)-$(version).tar.gz";\ + github-release release \ + --user $(github_account) \ + --repo $(package_name) \ + --target $(branch) \ + --tag $(version) \ + --description "**Download**<br />$$link<br /><br />**Changelog**<br/>$$changelog<br />" \ + --name "$(app_name) v$(version)"; \ + fi; \ + github-upload: + if [ -z "$(release_account)" ]; then \ + release_account=$(github_account); \ + else \ + release_account=$(release_account); \ + fi; \ github-release upload \ - --user $(github_account) \ - --repo $(app_name) \ - --tag v$(version) \ - --name "$(app_name)-$(version).tar.gz" \ - --file $(build_dir)/$(app_name)-$(version).tar.gz + --user $$release_account \ + --repo $(package_name) \ + --tag $(version) \ + --name "$(package_name)-$(version).tar.gz" \ + --file $(build_dir)/$(package_name)-$(version).tar.gz + clean: rm -rf $(build_dir) @@ -37,6 +72,7 @@ clean: # composer packages composer: composer install --prefer-dist + composer upgrade --prefer-dist appstore: clean composer mkdir -p $(sign_dir) @@ -53,16 +89,17 @@ appstore: clean composer --exclude=/issue_template.md \ --exclude=/README.md \ --exclude=/composer.json \ + --exclude=/testConfiguration.json \ --exclude=/composer.lock \ --exclude=/.gitattributes \ --exclude=/.gitignore \ --exclude=/.scrutinizer.yml \ --exclude=/.travis.yml \ --exclude=/Makefile \ - ./ $(sign_dir)/$(app_name) - tar -czf $(build_dir)/$(app_name)-$(version).tar.gz \ - -C $(sign_dir) $(app_name) - @if [ -f $(cert_dir)/$(app_name).key ]; then \ + ./ $(sign_dir)/$(package_name) + tar -czf $(build_dir)/$(package_name)-$(version).tar.gz \ + -C $(sign_dir) $(package_name) + @if [ -f $(cert_dir)/$(package_name).key ]; then \ echo "Signing packageā¦"; \ - openssl dgst -sha512 -sign $(cert_dir)/$(app_name).key $(build_dir)/$(app_name)-$(version).tar.gz | openssl base64; \ + openssl dgst -sha512 -sign $(cert_dir)/$(package_name).key $(build_dir)/$(package_name)-$(version).tar.gz | openssl base64; \ fi diff --git a/appinfo/info.xml b/appinfo/info.xml index b98dc98e..5d104e02 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -23,7 +23,7 @@ Users won't be able to find this Circle using Nextcloud search engine. ]]> </description> - <version>0.20.9</version> + <version>0.20.10</version> <licence>agpl</licence> <author>Maxence Lange</author> <types> |