From 2a3507549306c64d68bd1a26a2a78fa4ea4bef97 Mon Sep 17 00:00:00 2001
From: Maxence Lange <maxence@artificial-owl.com>
Date: Mon, 28 Jun 2021 22:59:28 -0100
Subject: [PATCH 1/2] 22.0.0-beta.4

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
---
 Makefile         | 53 ++++++++++++++++++++++++++++++++++++++++--------
 appinfo/info.xml |  4 +---
 composer.lock    | 12 +++++------
 3 files changed, 51 insertions(+), 18 deletions(-)

diff --git a/Makefile b/Makefile
index 757e72db3..dd81864bb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-app_name=circles
+app_name=Circles
 
 build_dir=$(CURDIR)/build/artifacts
 appstore_dir=$(build_dir)/appstore
@@ -7,29 +7,64 @@ sign_dir=$(build_dir)/sign
 package_name=$(app_name)
 cert_dir=$(HOME)/.nextcloud/certificates
 github_account=nextcloud
-branch=master
-version+=22.0.0-beta.2
+release_account=nextcloud-releases
+branch=stable22
+version=22.0.0-beta.4
+since_tag=22.0.0-beta.3
 
 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); \
 	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**<br/>$$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**<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) \
+		--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
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 2308e1780..612ff06f6 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -8,7 +8,7 @@
 Those groups of users (or "circles") can then be used by any other app for sharing purpose.
 		]]>
 	</description>
-	<version>22.0.0-beta.2</version>
+	<version>22.0.0-beta.4</version>
 	<licence>agpl</licence>
 	<author>Maxence Lange</author>
 	<types>
@@ -32,8 +32,6 @@ Those groups of users (or "circles") can then be used by any other app for shari
 	<default_enable/>
 	<background-jobs>
 		<job>OCA\Circles\Cron\Maintenance</job>
-		<!--		<job>OCA\Circles\Cron\ContactsExistingShares</job>-->
-		<!--		<job>OCA\Circles\Cron\GlobalSync</job>-->
 	</background-jobs>
 
 	<repair-steps>
diff --git a/composer.lock b/composer.lock
index e184cf4e3..339148b14 100644
--- a/composer.lock
+++ b/composer.lock
@@ -8,16 +8,16 @@
     "packages": [
         {
             "name": "artificial-owl/my-small-php-tools",
-            "version": "v22.1.3",
+            "version": "v22.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ArtificialOwl/my-small-php-tools.git",
-                "reference": "cb39c80043ebff1e5148e9d3353559859cc7a991"
+                "reference": "a2bea29012063176333a4dd257793996a3b250c3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ArtificialOwl/my-small-php-tools/zipball/cb39c80043ebff1e5148e9d3353559859cc7a991",
-                "reference": "cb39c80043ebff1e5148e9d3353559859cc7a991",
+                "url": "https://api.github.com/repos/ArtificialOwl/my-small-php-tools/zipball/a2bea29012063176333a4dd257793996a3b250c3",
+                "reference": "a2bea29012063176333a4dd257793996a3b250c3",
                 "shasum": ""
             },
             "require": {
@@ -42,9 +42,9 @@
             "description": "My small PHP Tools",
             "support": {
                 "issues": "https://github.com/ArtificialOwl/my-small-php-tools/issues",
-                "source": "https://github.com/ArtificialOwl/my-small-php-tools/tree/v22.1.3"
+                "source": "https://github.com/ArtificialOwl/my-small-php-tools/tree/v22.1.4"
             },
-            "time": "2021-06-22T00:01:10+00:00"
+            "time": "2021-06-26T23:42:06+00:00"
         }
     ],
     "packages-dev": [],

From dc06bfe4e1a34a0a7ae4f84b3c09bdf5edaa988a Mon Sep 17 00:00:00 2001
From: Maxence Lange <maxence@artificial-owl.com>
Date: Mon, 28 Jun 2021 23:22:07 -0100
Subject: [PATCH 2/2] adding repo to changelog

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index dd81864bb..725ca2ed4 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@ github-release:
 	fi; \
 	comparison="$$latest_tag..HEAD"; \
 	if [ -z "$$latest_tag" ]; then comparison=""; fi; \
-	changelog=$$(git log $$comparison --oneline --no-merges); \
+	changelog=$$(git log $$comparison --oneline --no-merges | sed -e 's/^/$(github_account)\/$(app_name)@/'); \
 	github-release release \
 		--user $$release_account \
 		--repo $(app_name) \