From 53ac06e9da10c2e87967938a7ac06983b17e5293 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Sun, 9 Oct 2016 11:51:12 +0200 Subject: [PATCH] mv EPL apps to (private) Github repos and fix composer and Travis accordingly --- .mrconfig | 17 +++++++------ .travis.yml | 5 ++-- composer.json | 4 +-- composer.lock | 70 ++++++++++++++++++++++++++++++++++++++------------- 4 files changed, 67 insertions(+), 29 deletions(-) diff --git a/.mrconfig b/.mrconfig index e21212f655..fd9303635b 100644 --- a/.mrconfig +++ b/.mrconfig @@ -20,10 +20,10 @@ checkout = git clone -b 16.1 ${EGW_REPO_BASE:-$(git config --get remote.origin.u [] # to run composer.phar automatic, this .mrconfig need to be trusted by adding it to ~/.mrtrust checkout = git clone git@github.com:EGroupware/egroupware.git && - /usr/bin/env $(which composer.phar >/dev/null && echo composer.phar || echo composer) install --no-dev + /usr/bin/env $(which composer.phar >/dev/null && echo composer.phar || echo composer) install update = git stash -q || true ; git pull --rebase ; git stash pop -q 2>/dev/null || true; rm -rf api/js/ckeditor; - /usr/bin/env $(which composer.phar >/dev/null && echo composer.phar || echo composer) install --no-dev + /usr/bin/env $(which composer.phar >/dev/null && echo composer.phar || echo composer) install # uncomment for minified javascript and css, IF you have nodejs and grunt installed: npm install -g grunt-cli #post_checkout = /usr/bin/env npm install && /usr/bin/env grunt #post_update = /usr/bin/env npm install && /usr/bin/env grunt @@ -58,6 +58,10 @@ checkout = git clone -b 16.1 ${EGW_REPO_BASE:-$(git config --get remote.origin.u # allows (after configuration!) to selfregister accounts and recover lost passwords #checkout = git clone -b 16.1 ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/registration.git +#[archive] +# allows to integrate a Benno mail-archive into EGroupware +#checkout = git clone -b 16.1 ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/archive.git + ### ### Older apps requiring to install phpgwapi and etemplate! ### @@ -98,10 +102,9 @@ checkout = git clone -b 16.1 ${EGW_REPO_BASE:-$(git config --get remote.origin.u ### EPL apps not publicly available ### #[stylite] -#checkout = svn checkout svn+ssh://stylite@svn.stylite.de/stylite/branches/16.1/stylite +#checkout = git clone -b 16.1 git@github.com:EGroupwareGmbH/epl.git stylite +#update = test -d .svn && { rm -rf * .svn; git clone -b 16.1 git@github.com:EGroupwareGmbH/epl.git .; } || git pull --rebase #[esyncpro] -#checkout = svn checkout svn+ssh://stylite@svn.stylite.de/stylite/branches/16.1/esyncpro - -#[archive] -#checkout = svn checkout svn+ssh://stylite@svn.stylite.de/stylite/trunk/archive +#checkout = git clone -b 16.1 git@github.com:EGroupwareGmbH/esyncpro.git +#update = test -d .svn && { rm -rf * .svn; git clone -b 16.1 git@github.com:EGroupwareGmbH/esyncpro.git .; } || git pull --rebase diff --git a/.travis.yml b/.travis.yml index 27a34972e3..65d7164a57 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,11 +56,12 @@ before_script: ;; esac #- php -m - - curl https://svn.stylite.de/fix_mrconfig 2>/dev/null | php + #- curl https://svn.stylite.de/fix_mrconfig 2>/dev/null | php + - sed 's/^update = git stash -q/update = \#git stash -q/g' .mrconfig - mr --trust-all --stats up - (cd activesync; mr --trust-all --stats up) # installing phpunit in version suitable for used PHP version - - composer update phpunit/phpunit + - composer require 'phpunit/phpunit:~4.8|~5.4' # create data directory - sudo mkdir /var/lib/egroupware - sudo chown travis /var/lib/egroupware diff --git a/composer.json b/composer.json index f58bfebd23..c621b453d0 100644 --- a/composer.json +++ b/composer.json @@ -33,9 +33,9 @@ "bower-asset/jquery-ui":"=1.11.2", "npm-asset/as-jqplot" : "1.0.*", "npm-asset/gridster":"0.5.*", - "adldap2/adldap2": "=4.0.4" + "adldap2/adldap2": "=4.0.4", + "egroupware/ckeditor": "^4.5" }, "require-dev": { - "phpunit/phpunit": "~4.8|~5.4" } } diff --git a/composer.lock b/composer.lock index e7fef8e1f8..05a4432cbb 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "9a74cc9727567f9100d4d1311228aede", - "content-hash": "d6ed8efbe2b9261641cf2d9ca9f1d01b", + "hash": "0fd472e38b5f3216ac30188ee1e50900", + "content-hash": "81fc5e942ad428500480b3cd69e6de3c", "packages": [ { "name": "adldap2/adldap2", @@ -160,17 +160,51 @@ } }, { - "name": "fxp/composer-asset-plugin", - "version": "v1.2.0", + "name": "egroupware/ckeditor", + "version": "v4.5.11", "source": { "type": "git", - "url": "https://github.com/fxpio/composer-asset-plugin.git", - "reference": "8d74bc7c714aadbda54622c216b2e7bf786595cb" + "url": "https://github.com/EGroupware/ckeditor.git", + "reference": "2a2e7805775b7afdb170566ff0132c6388966d98" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fxpio/composer-asset-plugin/zipball/8d74bc7c714aadbda54622c216b2e7bf786595cb", - "reference": "8d74bc7c714aadbda54622c216b2e7bf786595cb", + "url": "https://api.github.com/repos/EGroupware/ckeditor/zipball/2a2e7805775b7afdb170566ff0132c6388966d98", + "reference": "2a2e7805775b7afdb170566ff0132c6388966d98", + "shasum": "" + }, + "require": { + "php": ">=5.4" + }, + "type": "library", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "GPL-2.0+", + "LGPL-2.1+", + "MPL-1.1+" + ], + "authors": [ + { + "name": "CKSource", + "homepage": "http://cksource.com" + } + ], + "description": "Compiled version of CKEditor customized for EGroupware project.", + "homepage": "https://github.com/EGroupware/ckeditor", + "time": "2016-10-07 08:47:41" + }, + { + "name": "fxp/composer-asset-plugin", + "version": "v1.2.1", + "source": { + "type": "git", + "url": "https://github.com/fxpio/composer-asset-plugin.git", + "reference": "d7d189e8ffac26a2e39e26a9c75e1fc5c2e2b98d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/fxpio/composer-asset-plugin/zipball/d7d189e8ffac26a2e39e26a9c75e1fc5c2e2b98d", + "reference": "d7d189e8ffac26a2e39e26a9c75e1fc5c2e2b98d", "shasum": "" }, "require": { @@ -213,7 +247,7 @@ "npm", "package" ], - "time": "2016-07-01 12:04:16" + "time": "2016-08-03 07:44:07" }, { "name": "npm-asset/as-jqplot", @@ -366,10 +400,10 @@ }, { "name": "pear-pear.horde.org/Horde_Crypt_Blowfish", - "version": "1.1.1", + "version": "1.1.2", "dist": { "type": "file", - "url": "https://pear.horde.org/get/Horde_Crypt_Blowfish-1.1.1.tgz", + "url": "https://pear.horde.org/get/Horde_Crypt_Blowfish-1.1.2.tgz", "reference": null, "shasum": null }, @@ -379,7 +413,7 @@ "php": "<8.0.0.0" }, "replace": { - "pear-horde/horde_crypt_blowfish": "== 1.1.1.0" + "pear-horde/horde_crypt_blowfish": "== 1.1.2.0" }, "type": "pear-library", "autoload": { @@ -525,10 +559,10 @@ }, { "name": "pear-pear.horde.org/Horde_Imap_Client", - "version": "2.29.8", + "version": "2.29.9", "dist": { "type": "file", - "url": "https://pear.horde.org/get/Horde_Imap_Client-2.29.8.tgz", + "url": "https://pear.horde.org/get/Horde_Imap_Client-2.29.9.tgz", "reference": null, "shasum": null }, @@ -547,7 +581,7 @@ "php": "<8.0.0.0" }, "replace": { - "pear-horde/horde_imap_client": "== 2.29.8.0" + "pear-horde/horde_imap_client": "== 2.29.9.0" }, "type": "pear-library", "autoload": { @@ -696,10 +730,10 @@ }, { "name": "pear-pear.horde.org/Horde_Mime", - "version": "2.10.0", + "version": "2.10.1", "dist": { "type": "file", - "url": "https://pear.horde.org/get/Horde_Mime-2.10.0.tgz", + "url": "https://pear.horde.org/get/Horde_Mime-2.10.1.tgz", "reference": null, "shasum": null }, @@ -716,7 +750,7 @@ "php": "<8.0.0.0" }, "replace": { - "pear-horde/horde_mime": "== 2.10.0.0" + "pear-horde/horde_mime": "== 2.10.1.0" }, "type": "pear-library", "autoload": {