Fix little things
All checks were successful
repod / nextcloud (push) Successful in 1m16s
repod / xml (push) Successful in 24s
repod / nodejs (push) Successful in 2m1s

This commit is contained in:
Michel Roux 2023-12-23 17:31:00 +00:00
parent c8f2e33b57
commit 93f47e7872
3 changed files with 22 additions and 12 deletions

9
.gitignore vendored
View File

@ -1,7 +1,8 @@
.idea
*.iml *.iml
/vendor/ .idea
/build/
node_modules/
/.php-cs-fixer.cache /.php-cs-fixer.cache
/.php_cs.cache
/build/
/vendor/
js/ js/
node_modules/

View File

@ -38,7 +38,7 @@ app_name=$(notdir $(CURDIR))
build_tools_directory=$(CURDIR)/build/tools build_tools_directory=$(CURDIR)/build/tools
source_build_directory=$(CURDIR)/build/artifacts/source source_build_directory=$(CURDIR)/build/artifacts/source
source_package_name=$(source_build_directory)/$(app_name) source_package_name=$(source_build_directory)/$(app_name)
appstore_build_directory=$(CURDIR)/build/artifacts/appstore appstore_build_directory=$(CURDIR)/build/artifacts
appstore_package_name=$(appstore_build_directory)/$(app_name) appstore_package_name=$(appstore_build_directory)/$(app_name)
npm=$(shell which npm 2> /dev/null) npm=$(shell which npm 2> /dev/null)
composer=$(shell which composer 2> /dev/null) composer=$(shell which composer 2> /dev/null)
@ -105,21 +105,22 @@ dist: build
source: source:
rm -rf $(source_build_directory) rm -rf $(source_build_directory)
mkdir -p $(source_build_directory) mkdir -p $(source_build_directory)
tar tar cvzf $(source_package_name).tar.gz \
--exclude-vcs \ --exclude-vcs \
--exclude="../$(app_name)/build" \ --exclude="../$(app_name)/build" \
--exclude="../$(app_name)/node_modules" \ --exclude="../$(app_name)/js/node_modules" \
--exclude="../$(app_name)/node_modules" \ --exclude="../$(app_name)/node_modules" \
--exclude="../$(app_name)/*.log" \ --exclude="../$(app_name)/*.log" \
--exclude="../$(app_name)/js/*.log" \ --exclude="../$(app_name)/js/*.log" \
-cvzf $(source_package_name).tar.gz ../$(app_name) ../$(app_name)
# Builds the source package for the app store, ignores php and js tests # Builds the source package for the app store, ignores php tests, js tests
# and build related folders that are unnecessary for an appstore release
.PHONY: appstore .PHONY: appstore
appstore: appstore:
rm -rf $(appstore_build_directory) rm -rf $(appstore_build_directory)
mkdir -p $(appstore_build_directory) mkdir -p $(appstore_build_directory)
tar tar cvzf $(appstore_package_name).tar.gz \
--exclude-vcs \ --exclude-vcs \
--exclude="../$(app_name)/build" \ --exclude="../$(app_name)/build" \
--exclude="../$(app_name)/tests" \ --exclude="../$(app_name)/tests" \
@ -128,6 +129,7 @@ appstore:
--exclude="../$(app_name)/phpunit*xml" \ --exclude="../$(app_name)/phpunit*xml" \
--exclude="../$(app_name)/composer.*" \ --exclude="../$(app_name)/composer.*" \
--exclude="../$(app_name)/node_modules" \ --exclude="../$(app_name)/node_modules" \
--exclude="../$(app_name)/js/node_modules" \
--exclude="../$(app_name)/js/tests" \ --exclude="../$(app_name)/js/tests" \
--exclude="../$(app_name)/js/test" \ --exclude="../$(app_name)/js/test" \
--exclude="../$(app_name)/js/*.log" \ --exclude="../$(app_name)/js/*.log" \
@ -135,16 +137,22 @@ appstore:
--exclude="../$(app_name)/js/bower.json" \ --exclude="../$(app_name)/js/bower.json" \
--exclude="../$(app_name)/js/karma.*" \ --exclude="../$(app_name)/js/karma.*" \
--exclude="../$(app_name)/js/protractor.*" \ --exclude="../$(app_name)/js/protractor.*" \
--exclude="../$(app_name)/package*.json" \ --exclude="../$(app_name)/package.json" \
--exclude="../$(app_name)/bower.json" \ --exclude="../$(app_name)/bower.json" \
--exclude="../$(app_name)/karma.*" \ --exclude="../$(app_name)/karma.*" \
--exclude="../$(app_name)/protractor\.*" \ --exclude="../$(app_name)/protractor\.*" \
--exclude="../$(app_name)/.*" \ --exclude="../$(app_name)/.*" \
--exclude="../$(app_name)/js/.*" \ --exclude="../$(app_name)/js/.*" \
--exclude="../$(app_name)/webpack.config.js" \
--exclude="../$(app_name)/stylelint.config.js" \
--exclude="../$(app_name)/CHANGELOG.md" \
--exclude="../$(app_name)/README.md" \
--exclude="../$(app_name)/package-lock.json" \
--exclude="../$(app_name)/LICENSES" \
--exclude="../$(app_name)/src" \ --exclude="../$(app_name)/src" \
--exclude="../$(app_name)/stubs" \ --exclude="../$(app_name)/stubs" \
--exclude="../$(app_name)/vendor" \ --exclude="../$(app_name)/vendor" \
-cvzf $(appstore_package_name).tar.gz ../$(app_name) ../$(app_name)
# Start a nextcloud server on Docker to kickstart developement # Start a nextcloud server on Docker to kickstart developement
.PHONY: appstore .PHONY: appstore

View File

@ -6,6 +6,7 @@
findUnusedCode="false" findUnusedCode="false"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="https://getpsalm.org/schema/config" xmlns="https://getpsalm.org/schema/config"
xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
> >
<projectFiles> <projectFiles>
<directory name="lib" /> <directory name="lib" />