diff --git a/CHANGELOG.md b/CHANGELOG.md
index df5285c..8a326d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
# Changelog
-### 21.0.2
+
+### 23.0.0
+
+- Fixing events
+
+
+### 21.0.2
- Adding some logging
- Fixing some crashing
diff --git a/Makefile b/Makefile
index 86503b5..244e69a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,5 @@
-app_name=files_fulltextsearch
+app_name=Files_FullTextSearch
-project_dir=$(CURDIR)
build_dir=$(CURDIR)/build/artifacts
appstore_dir=$(build_dir)/appstore
source_dir=$(build_dir)/source
@@ -8,50 +7,74 @@ sign_dir=$(build_dir)/sign
package_name=$(app_name)
cert_dir=$(HOME)/.nextcloud/certificates
github_account=nextcloud
+release_account=nextcloud-releases
branch=master
-codecov_token_dir=$(HOME)/.nextcloud/codecov_token
-version+=21.0.2
-
+version=23.0.0-dev
+since_tag=21.0.2
all: appstore
release: appstore github-release github-upload
-dev-setup: clean composer
-
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)\/$(app_name)@/'); \
github-release release \
- --user $(github_account) \
+ --user $$release_account \
--repo $(app_name) \
- --target $(branch) \
- --tag v$(version) \
- --name "$(app_name) v$(version)"
+ --target $$release_branch \
+ --tag $(version) \
+ --description "**Changelog**
$$changelog" \
+ --name "$(app_name) v$(version)"; \
+ if [ $(github_account) != $$release_account ]; then \
+ link="https://github.com/$$release_account/$(app_name)/releases/download/$(version)/$(app_name)-$(version).tar.gz";\
+ github-release release \
+ --user $(github_account) \
+ --repo $(app_name) \
+ --target $(branch) \
+ --tag $(version) \
+ --description "**Download**
$$link
**Changelog**
$$changelog
" \
+ --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) \
+ --user $$release_account \
--repo $(app_name) \
- --tag v$(version) \
+ --tag $(version) \
--name "$(app_name)-$(version).tar.gz" \
--file $(build_dir)/$(app_name)-$(version).tar.gz
+
clean:
rm -rf $(build_dir)
rm -rf node_modules
- rm -rf vendor
+# composer packages
composer:
composer install --prefer-dist
- composer update --prefer-dist
-
-test: SHELL:=/bin/bash
-test:
- phpunit --coverage-clover=coverage.xml --configuration=tests/phpunit.xml tests
- @if [ -f $(codecov_token_dir)/$(app_name) ]; then \
- bash <(curl -s https://codecov.io/bash) -t @$(codecov_token_dir)/$(app_name) ; \
- fi
+ composer upgrade --prefer-dist
-appstore: dev-setup
+appstore: clean composer
mkdir -p $(sign_dir)
rsync -a \
--exclude=/build \
@@ -61,18 +84,19 @@ appstore: dev-setup
--exclude=/tests \
--exclude=.git \
--exclude=/.github \
- --exclude=/composer.json \
- --exclude=/composer.lock \
--exclude=/l10n/l10n.pl \
--exclude=/CONTRIBUTING.md \
--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 \
- $(project_dir)/ $(sign_dir)/$(app_name)
+ ./ $(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 \
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 6ec2bdd..9c1395f 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -10,7 +10,7 @@ Extension to the _Full text search_ app to index your users' files.
]]>
- 21.0.2
+ 23.0.0-dev
agpl
Maxence Lange
Files_FullTextSearch
@@ -26,7 +26,7 @@ Extension to the _Full text search_ app to index your users' files.
https://github.com/nextcloud/files_fulltextsearch.git
https://raw.githubusercontent.com/nextcloud/fulltextsearch/master/screenshots/0.3.0.png
-
+
diff --git a/composer.json b/composer.json
index a674186..fcd5b21 100644
--- a/composer.json
+++ b/composer.json
@@ -20,6 +20,6 @@
}
},
"require": {
- "artificial-owl/my-small-php-tools": "~22"
+ "artificial-owl/my-small-php-tools": "~23"
}
}
diff --git a/composer.lock b/composer.lock
index 309ed72..78363c9 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,20 +4,20 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "7fcd0680e0a24dfd92e6144ddaf00c5d",
+ "content-hash": "e4bfd84129beb57fa3986a751c58f6b6",
"packages": [
{
- "name": "daita/my-small-php-tools",
- "version": "v22.0.3",
+ "name": "artificial-owl/my-small-php-tools",
+ "version": "v23.0.1",
"source": {
"type": "git",
- "url": "https://github.com/daita/my-small-php-tools.git",
- "reference": "5a6c67be6f76955f44651fba8ebad9e6f9216acc"
+ "url": "https://github.com/ArtificialOwl/my-small-php-tools.git",
+ "reference": "f6141b8d572dc11fe73db99d37f8fd3389550eec"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/daita/my-small-php-tools/zipball/5a6c67be6f76955f44651fba8ebad9e6f9216acc",
- "reference": "5a6c67be6f76955f44651fba8ebad9e6f9216acc",
+ "url": "https://api.github.com/repos/ArtificialOwl/my-small-php-tools/zipball/f6141b8d572dc11fe73db99d37f8fd3389550eec",
+ "reference": "f6141b8d572dc11fe73db99d37f8fd3389550eec",
"shasum": ""
},
"require": {
@@ -26,7 +26,7 @@
"type": "library",
"autoload": {
"psr-4": {
- "daita\\MySmallPhpTools\\": "lib/"
+ "ArtificialOwl\\MySmallPhpTools\\": "lib/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -41,10 +41,10 @@
],
"description": "My small PHP Tools",
"support": {
- "issues": "https://github.com/daita/my-small-php-tools/issues",
- "source": "https://github.com/daita/my-small-php-tools/tree/v22.0.3"
+ "issues": "https://github.com/ArtificialOwl/my-small-php-tools/issues",
+ "source": "https://github.com/ArtificialOwl/my-small-php-tools/tree/v23.0.1"
},
- "time": "2021-05-04T18:18:55+00:00"
+ "time": "2021-07-11T13:19:33+00:00"
}
],
"packages-dev": [],