extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-27 02:14:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

mv EPL apps to (private) Github repos and fix composer and Travis accordingly

Browse Source
This commit is contained in:
Ralf Becker 2016-10-09 11:51:12 +02:00
parent 271e594a7a
commit 53ac06e9da
4 changed files with 67 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.mrconfig
View File

@ -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 # 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 && 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; update = git stash -q || true ; git pull --rebase ; git stash pop -q 2>/dev/null || true;
rm -rf api/js/ckeditor; 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 # 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_checkout = /usr/bin/env npm install && /usr/bin/env grunt
#post_update = /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 # 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 #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! ### 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 ### EPL apps not publicly available
### ###
#[stylite] #[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] #[esyncpro]
#checkout = svn checkout svn+ssh://stylite@svn.stylite.de/stylite/branches/16.1/esyncpro #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
#[archive]
#checkout = svn checkout svn+ssh://stylite@svn.stylite.de/stylite/trunk/archive

5
.travis.yml
View File

@ -56,11 +56,12 @@ before_script:
;; ;;
esac esac
#- php -m #- 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 - mr --trust-all --stats up
- (cd activesync; mr --trust-all --stats up) - (cd activesync; mr --trust-all --stats up)
# installing phpunit in version suitable for used PHP version # installing phpunit in version suitable for used PHP version
- composer update phpunit/phpunit - composer require 'phpunit/phpunit:~4.8|~5.4'
# create data directory # create data directory
- sudo mkdir /var/lib/egroupware - sudo mkdir /var/lib/egroupware
- sudo chown travis /var/lib/egroupware - sudo chown travis /var/lib/egroupware

4
composer.json
View File

@ -33,9 +33,9 @@
"bower-asset/jquery-ui":"=1.11.2", "bower-asset/jquery-ui":"=1.11.2",
"npm-asset/as-jqplot" : "1.0.*", "npm-asset/as-jqplot" : "1.0.*",
"npm-asset/gridster":"0.5.*", "npm-asset/gridster":"0.5.*",
"adldap2/adldap2": "=4.0.4" "adldap2/adldap2": "=4.0.4",
"egroupware/ckeditor": "^4.5"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "~4.8|~5.4"
} }
} }

70
composer.lock generated
View File

@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"hash": "9a74cc9727567f9100d4d1311228aede", "hash": "0fd472e38b5f3216ac30188ee1e50900",
"content-hash": "d6ed8efbe2b9261641cf2d9ca9f1d01b", "content-hash": "81fc5e942ad428500480b3cd69e6de3c",
"packages": [ "packages": [
{ {
"name": "adldap2/adldap2", "name": "adldap2/adldap2",
@ -160,17 +160,51 @@
} }
}, },
{ {
"name": "fxp/composer-asset-plugin", "name": "egroupware/ckeditor",
"version": "v1.2.0", "version": "v4.5.11",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/fxpio/composer-asset-plugin.git", "url": "https://github.com/EGroupware/ckeditor.git",
"reference": "8d74bc7c714aadbda54622c216b2e7bf786595cb" "reference": "2a2e7805775b7afdb170566ff0132c6388966d98"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/fxpio/composer-asset-plugin/zipball/8d74bc7c714aadbda54622c216b2e7bf786595cb", "url": "https://api.github.com/repos/EGroupware/ckeditor/zipball/2a2e7805775b7afdb170566ff0132c6388966d98",
"reference": "8d74bc7c714aadbda54622c216b2e7bf786595cb", "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": "" "shasum": ""
}, },
"require": { "require": {
@ -213,7 +247,7 @@
"npm", "npm",
"package" "package"
], ],
"time": "2016-07-01 12:04:16" "time": "2016-08-03 07:44:07"
}, },
{ {
"name": "npm-asset/as-jqplot", "name": "npm-asset/as-jqplot",
@ -366,10 +400,10 @@
}, },
{ {
"name": "pear-pear.horde.org/Horde_Crypt_Blowfish", "name": "pear-pear.horde.org/Horde_Crypt_Blowfish",
"version": "1.1.1", "version": "1.1.2",
"dist": { "dist": {
"type": "file", "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, "reference": null,
"shasum": null "shasum": null
}, },
@ -379,7 +413,7 @@
"php": "<8.0.0.0" "php": "<8.0.0.0"
}, },
"replace": { "replace": {
"pear-horde/horde_crypt_blowfish": "== 1.1.1.0" "pear-horde/horde_crypt_blowfish": "== 1.1.2.0"
}, },
"type": "pear-library", "type": "pear-library",
"autoload": { "autoload": {
@ -525,10 +559,10 @@
}, },
{ {
"name": "pear-pear.horde.org/Horde_Imap_Client", "name": "pear-pear.horde.org/Horde_Imap_Client",
"version": "2.29.8", "version": "2.29.9",
"dist": { "dist": {
"type": "file", "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, "reference": null,
"shasum": null "shasum": null
}, },
@ -547,7 +581,7 @@
"php": "<8.0.0.0" "php": "<8.0.0.0"
}, },
"replace": { "replace": {
"pear-horde/horde_imap_client": "== 2.29.8.0" "pear-horde/horde_imap_client": "== 2.29.9.0"
}, },
"type": "pear-library", "type": "pear-library",
"autoload": { "autoload": {
@ -696,10 +730,10 @@
}, },
{ {
"name": "pear-pear.horde.org/Horde_Mime", "name": "pear-pear.horde.org/Horde_Mime",
"version": "2.10.0", "version": "2.10.1",
"dist": { "dist": {
"type": "file", "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, "reference": null,
"shasum": null "shasum": null
}, },
@ -716,7 +750,7 @@
"php": "<8.0.0.0" "php": "<8.0.0.0"
}, },
"replace": { "replace": {
"pear-horde/horde_mime": "== 2.10.0.0" "pear-horde/horde_mime": "== 2.10.1.0"
}, },
"type": "pear-library", "type": "pear-library",
"autoload": { "autoload": {