Skip to content

Run local server in its own folder #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
phil-davis merged 1 commit into from
Jan 22, 2019
Merged

Run local server in its own folder #92

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions .drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
workspace:
base: /var/www/owncloud
path: apps/encryption
path: server/apps/encryption

branches: [master, release*, release/*]

pipeline:
install-core:
image: owncloudci/core
version: ${OC_VERSION}
core_path: /var/www/owncloud/server
pull: true
exclude: "apps/encryption"
db_type: ${DB_TYPE}
Expand Down Expand Up @@ -58,7 +59,7 @@ pipeline:
image: owncloudci/php:${PHP_VERSION}
pull: true
commands:
- cd /var/www/owncloud/
- cd /var/www/owncloud/server
- php occ a:l
- php occ a:e encryption
- php occ a:e testing
Expand All @@ -77,9 +78,9 @@ pipeline:
image: owncloudci/php:${PHP_VERSION}
pull: true
commands:
- chown www-data /var/www/owncloud -R
- chmod 777 /var/www/owncloud/tests/acceptance/filesForUpload -R
- chmod +x /var/www/owncloud/tests/acceptance/run.sh
- chown www-data /var/www/owncloud/server -R
Copy link
Member

@individual-it individual-it Jan 22, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could use:

Suggested change
- chown www-data /var/www/owncloud/server -R
- chown www-data /var/www/owncloud -R

here and get rid of fix-permissions-federation-server:

Copy link
Contributor Author

@phil-davis phil-davis Jan 22, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, some day. CI takes >2 hours so I don't want to touch code unless I have to!

- chmod 777 /var/www/owncloud/server/tests/acceptance/filesForUpload -R
- chmod +x /var/www/owncloud/server/tests/acceptance/run.sh
when:
matrix:
NEED_SERVER: true
Expand All @@ -89,7 +90,7 @@ pipeline:
detach: true
pull: true
commands:
- tail -f /var/www/owncloud/data/owncloud.log
- tail -f /var/www/owncloud/server/data/owncloud.log
when:
matrix:
NEED_SERVER: true
Expand All @@ -107,7 +108,7 @@ pipeline:
image: owncloudci/php:${PHP_VERSION}
pull: true
commands:
- cd /var/www/owncloud
- cd /var/www/owncloud/server
#- php ./occ app:check-code encryption -c private -c strong-comparison
- php ./occ app:check-code encryption -c deprecation
when:
Expand All @@ -119,7 +120,7 @@ pipeline:
image: owncloudci/php:7.1
pull: true
environment:
- COMPOSER_HOME=/var/www/owncloud/apps/password_policy/.cache/composer
- COMPOSER_HOME=/var/www/owncloud/server/apps/encryption/.cache/composer
Copy link
Contributor Author

@phil-davis phil-davis Jan 22, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also adjust some old cut-paste errors in phpstan and phan pipeline steps. These are steps that are for future use (the necessary commands are in ```Makefile`` but the code analysis fixes have not been made yet). They are not being actually run in CI yet. That is why these cut-paste errors were not causing any failure.

commands:
- make test-php-phpstan
when:
Expand All @@ -131,7 +132,7 @@ pipeline:
image: owncloudci/php:7.0
pull: true
environment:
- COMPOSER_HOME=/var/www/owncloud/apps/password_policy/.cache/composer
- COMPOSER_HOME=/var/www/owncloud/server/apps/encryption/.cache/composer
commands:
- make test-php-phan
when:
Expand All @@ -143,7 +144,7 @@ pipeline:
image: owncloudci/php:7.1
pull: true
environment:
- COMPOSER_HOME=/var/www/owncloud/apps/password_policy/.cache/composer
- COMPOSER_HOME=/var/www/owncloud/server/apps/encryption/.cache/composer
commands:
- make test-php-phan
when:
Expand All @@ -155,7 +156,7 @@ pipeline:
image: owncloudci/php:7.2
pull: true
environment:
- COMPOSER_HOME=/var/www/owncloud/apps/password_policy/.cache/composer
- COMPOSER_HOME=/var/www/owncloud/server/apps/encryption/.cache/composer
commands:
- make test-php-phan
when:
Expand Down Expand Up @@ -266,7 +267,7 @@ services:
image: owncloudci/php:${PHP_VERSION}
pull: true
environment:
- APACHE_WEBROOT=/var/www/owncloud
- APACHE_WEBROOT=/var/www/owncloud/server
command: [ "/usr/local/bin/apachectl", "-e", "debug" , "-D", "FOREGROUND" ]
when:
matrix:
Expand Down