diff options
| author | Christoph Wurst <ChristophWurst@users.noreply.github.com> | 2017-01-09 16:43:45 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-09 16:43:45 +0300 |
| commit | f9d663ec7a92a0faf8a9d9b421b21a44dd675511 (patch) | |
| tree | 6e81737b05648b1c97405ac6879de6ff5aeeb62f | |
| parent | 7e825009647f7eb481b153e5d20275cc1abe68ac (diff) | |
| parent | 17c761e21f5d8f95135e135c41077aaacf231dfb (diff) | |
Merge pull request #25 from nextcloud/exclude-yubico-examplesnightly-20170109nightly-2017-01-09
Do not package example files
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | Makefile | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index f9744e0..4d46fa6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,7 +41,6 @@ before_install: - if [[ "$DB" == 'mysql' ]]; then mysql -u root -e "GRANT ALL ON nc_autotest.* TO 'nc_autotest'@'localhost';"; fi - composer self-update - - composer install - cd .. - git clone https://github.com/nextcloud/server.git --recursive --depth 1 -b $CORE_BRANCH core @@ -17,11 +17,6 @@ clean: composer.phar: curl -sS https://getcomposer.org/installer | php -install-deps: install-composer-deps - -install-composer-deps: composer.phar - php composer.phar install - update-composer: composer.phar rm -f composer.lock php composer.phar install --prefer-dist @@ -46,6 +41,7 @@ appstore: --exclude=phpunit*xml \ --exclude=tests \ --exclude=vendor/bin \ + --exclude=vendor/yubico/u2flib-server/examples \ $(project_dir) $(sign_dir) @echo "Signing…" php ../../occ integrity:sign-app \ |