Merge pull request #1522 from nextcloud/release/0.5.0-beta3

0.5.0-beta3

4 files changed, 31 insertions, 46 deletions

diff --git a/Makefile b/Makefile
index 18cc8d9b..c7c77f79 100644
--- a/Makefile
+++ b/Makefile
@@ -11,9 +11,7 @@ package_name=$(app_name)
 cert_dir=$(HOME)/.nextcloud/certificates
 github_account=nextcloud
 branch=master
-version+=0.4.2
-
-
+version+=0.5.0-beta3
 
 
 all: dev-setup lint build-js-production composer test
@@ -68,30 +66,20 @@ composer:
 	composer install --prefer-dist
 	composer update --prefer-dist
 
-# releasing to github
-release: appstore github-release github-upload
-
-github-release:
-	github-release release \
-		--user $(github_account) \
-		--repo $(app_name) \
-		--target $(branch) \
-		--tag v$(version) \
-		--name "$(app_name) v$(version)"
-
-github-upload:
-	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
+release: appstore
 
 # creating .tar.gz + signature
-appstore: dev-setup lint build-js-production
+appstore: dev-setup lint build-js-production composer
 	mkdir -p $(sign_dir)
 	rsync -a \
 	--exclude=/build \
+	--exclude=/babel.config.js \
+	--exclude=/cypress.json \
+	--exclude=/.php-cs-fixer.cache \
+	--exclude=/.nextcloudignore \
+	--exclude=/.php-cs-fixer.dist.php \
+	--exclude=/psalm.xml \
+	--exclude=/cypress.json \
 	--exclude=/docs \
 	--exclude=/translationfiles \
 	--exclude=/.tx \
@@ -111,6 +99,7 @@ appstore: dev-setup lint build-js-production
 	--exclude=/l10n/l10n.pl \
 	--exclude=/CONTRIBUTING.md \
 	--exclude=/issue_template.md \
+	--exclude=/krankerl.toml \
 	--exclude=/README.md \
 	--exclude=/.gitattributes \
 	--exclude=/.gitignore \
@@ -118,9 +107,6 @@ appstore: dev-setup lint build-js-production
 	--exclude=/.travis.yml \
 	--exclude=/Makefile \
 	$(project_dir)/ $(sign_dir)/$(app_name)
-	tar -czf $(build_dir)/$(app_name)-$(version).tar.gz \
+	tar -czf $(build_dir)/$(app_name).tar.gz \
 		-C $(sign_dir) $(app_name)
-	@if [ -f $(cert_dir)/$(app_name).key ]; then \
-		echo "Signing package…"; \
-		openssl dgst -sha512 -sign $(cert_dir)/$(app_name).key $(build_dir)/$(app_name)-$(version).tar.gz | openssl base64; \
-	fi
+
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 54375641..27c5cda2 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -18,7 +18,7 @@
 
 **🕸 Open standards:** We use the established ActivityPub standard!
 	]]></description>
-	<version>0.5.0-beta</version>
+	<version>0.5.0-beta3</version>
 	<licence>agpl</licence>
 	<author mail="maxence@artificial-owl.com" homepage="https://artificial-owl.com/">Maxence Lange</author>
 	<author mail="jus@bitgrid.net">Julius Härtl</author>
diff --git a/composer.lock b/composer.lock
index d9bdaa1a..3e65302c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -352,16 +352,16 @@
         },
         {
             "name": "composer/pcre",
-            "version": "3.0.0",
+            "version": "3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/pcre.git",
-                "reference": "e300eb6c535192decd27a85bc72a9290f0d6b3bd"
+                "reference": "4482b6409ca6bfc2af043a5711cd21ac3e7a8dfb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/pcre/zipball/e300eb6c535192decd27a85bc72a9290f0d6b3bd",
-                "reference": "e300eb6c535192decd27a85bc72a9290f0d6b3bd",
+                "url": "https://api.github.com/repos/composer/pcre/zipball/4482b6409ca6bfc2af043a5711cd21ac3e7a8dfb",
+                "reference": "4482b6409ca6bfc2af043a5711cd21ac3e7a8dfb",
                 "shasum": ""
             },
             "require": {
@@ -403,7 +403,7 @@
             ],
             "support": {
                 "issues": "https://github.com/composer/pcre/issues",
-                "source": "https://github.com/composer/pcre/tree/3.0.0"
+                "source": "https://github.com/composer/pcre/tree/3.0.2"
             },
             "funding": [
                 {
@@ -419,7 +419,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-02-25T20:21:48+00:00"
+            "time": "2022-11-03T20:24:16+00:00"
         },
         {
             "name": "composer/semver",
@@ -1171,12 +1171,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/nextcloud-deps/ocp.git",
-                "reference": "0429f70b4a9b83d5aacf0d7b7b74ac660328af33"
+                "reference": "81fabae31c9bb142d5d0d4d52384fe98d757ab49"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/0429f70b4a9b83d5aacf0d7b7b74ac660328af33",
-                "reference": "0429f70b4a9b83d5aacf0d7b7b74ac660328af33",
+                "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/81fabae31c9bb142d5d0d4d52384fe98d757ab49",
+                "reference": "81fabae31c9bb142d5d0d4d52384fe98d757ab49",
                 "shasum": ""
             },
             "require": {
@@ -1207,7 +1207,7 @@
                 "issues": "https://github.com/nextcloud-deps/ocp/issues",
                 "source": "https://github.com/nextcloud-deps/ocp/tree/master"
             },
-            "time": "2022-11-01T00:57:38+00:00"
+            "time": "2022-11-04T00:49:09+00:00"
         },
         {
             "name": "nikic/php-parser",
@@ -4617,16 +4617,16 @@
         },
         {
             "name": "vimeo/psalm",
-            "version": "4.29.0",
+            "version": "4.30.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/vimeo/psalm.git",
-                "reference": "7ec5ffbd5f68ae03782d7fd33fff0c45a69f95b3"
+                "reference": "d0bc6e25d89f649e4f36a534f330f8bb4643dd69"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/vimeo/psalm/zipball/7ec5ffbd5f68ae03782d7fd33fff0c45a69f95b3",
-                "reference": "7ec5ffbd5f68ae03782d7fd33fff0c45a69f95b3",
+                "url": "https://api.github.com/repos/vimeo/psalm/zipball/d0bc6e25d89f649e4f36a534f330f8bb4643dd69",
+                "reference": "d0bc6e25d89f649e4f36a534f330f8bb4643dd69",
                 "shasum": ""
             },
             "require": {
@@ -4719,9 +4719,9 @@
             ],
             "support": {
                 "issues": "https://github.com/vimeo/psalm/issues",
-                "source": "https://github.com/vimeo/psalm/tree/4.29.0"
+                "source": "https://github.com/vimeo/psalm/tree/4.30.0"
             },
-            "time": "2022-10-11T17:09:17+00:00"
+            "time": "2022-11-06T20:37:08+00:00"
         },
         {
             "name": "webmozart/assert",
diff --git a/krankerl.toml b/krankerl.toml
index 108b651f..5cf812a0 100644
--- a/krankerl.toml
+++ b/krankerl.toml
@@ -1,5 +1,4 @@
 [package]
 before_cmds = [
-	'npm ci',
-	'npm run build'
+	'make release'
 ]