From 85af157cb7bb6a54975ab0ff2fdaa930decb66e5 Mon Sep 17 00:00:00 2001
From: Julien Veyssier <julien-nc@posteo.net>
Date: Mon, 1 Apr 2024 17:49:23 +0200
Subject: [PATCH] no composer dev pkgs in release, exclude .idea

Signed-off-by: Julien Veyssier <julien-nc@posteo.net>
---
 .github/workflows/release.yml |  3 ---
 composer.json                 |  2 +-
 makefile                      | 18 ++++++++++++++++--
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 54c3256f..3c1eaa50 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -27,7 +27,6 @@ jobs:
           extensions: mbstring, intl, sqlite3
           ini-values: post_max_size=256M, max_execution_time=180
           coverage: xdebug
-          tools: php-cs-fixer, phpunit
 
       - name: Checkout code
         uses: actions/checkout@v2
@@ -63,8 +62,6 @@ jobs:
           php ~/html/nextcloud/occ app:enable ${APP_ID}
           php ~/html/nextcloud/occ maintenance:mode --off
           cd ~/html/nextcloud/apps/${APP_ID}
-          echo "###### make"
-          make
           echo "###### make appstore"
           tag=${{ steps.tag.outputs.currenttag }}
           version=${tag/v/}
diff --git a/composer.json b/composer.json
index 366c994a..4092991e 100644
--- a/composer.json
+++ b/composer.json
@@ -28,6 +28,6 @@
 		"psalm/phar": "^5.16",
 		"nextcloud/ocp": "dev-master",
 		"phpunit/phpunit": "^9.5",
-		"nextcloud/openapi-extractor": "dev-feat/openapitype/better-error-messages"
+		"nextcloud/openapi-extractor": "dev-main"
 	}
 }
diff --git a/makefile b/makefile
index 078d895d..876ecd85 100644
--- a/makefile
+++ b/makefile
@@ -5,7 +5,7 @@ build_dir=/tmp/build
 sign_dir=/tmp/sign
 cert_dir=$(HOME)/.nextcloud/certificates
 webserveruser ?= www-data
-occ_dir ?= /var/www/html/dev/server21
+occ_dir ?= /var/www/html/dev/server
 
 GITHUB_TOKEN := $(shell cat ~/.nextcloud/secrets/GITHUB_TOKEN | tr -d '\n')
 GITHUB_REPO=julien-nc/cospend-nc
@@ -48,6 +48,18 @@ else
 	composer install --prefer-dist
 endif
 
+.PHONY: composer_release
+composer_release:
+ifeq (, $(composer))
+	@echo "No composer command available, downloading a copy from the web"
+	mkdir -p $(build_tools_directory)
+	curl -sS https://getcomposer.org/installer | php
+	mv composer.phar $(build_tools_directory)
+	php $(build_tools_directory)/composer.phar install --prefer-dist
+else
+	composer install --no-dev -a
+endif
+
 .PHONY: npm
 npm:
 	$(npm) ci
@@ -61,14 +73,16 @@ npm-dev:
 clean:
 	sudo rm -rf $(build_dir)
 	sudo rm -rf $(sign_dir)
+	rm -rf js/* vendor
 
-build_release: clean
+build_release: clean composer_release npm
 	mkdir -p $(sign_dir)
 	mkdir -p $(build_dir)
 	@rsync -a \
 	--exclude=.git \
 	--exclude=appinfo/signature.json \
 	--exclude=*.swp \
+	--exclude=/.idea \
 	--exclude=build \
 	--exclude=.gitignore \
 	--exclude=.travis.yml \