Skip to content
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.

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

Add TZ & LANG #1264

Merged
merged 1 commit into from
Sep 27, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ yarn-error.log*
js/
build/
coverage*
vendor/
12 changes: 7 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ sudo: required
dist: trusty
language: php
php:
- 7.1
- 7.2
- 7.3

# Server requires PostgreSQL >= 9.5
addons:
Expand Down Expand Up @@ -35,14 +35,14 @@ branches:

matrix:
include:
- php: 7.1
env: "DB=mysql CORE_BRANCH=master"
- php: 7.2
env: "DB=mysql CORE_BRANCH=master"
- php: 7.3
env: "DB=mysql CORE_BRANCH=master TEST_JS=TRUE PHP_COVERAGE=TRUE"
- php: 7.1
env: "DB=pgsql CORE_BRANCH=master"
- php: 7.2
env: "DB=pgsql CORE_BRANCH=master"
- php: 7.3
env: "DB=pgsql CORE_BRANCH=master"
fast_finish: true

cache:
Expand All @@ -58,6 +58,8 @@ before_install:
- if [[ "$DB" == 'mysql' ]]; then mysql -u root -e 'create database oc_autotest;'; fi
- if [[ "$DB" == 'mysql' ]]; then mysql -u root -e "CREATE USER 'oc_autotest'@'localhost' IDENTIFIED BY '';"; fi
- if [[ "$DB" == 'mysql' ]]; then mysql -u root -e "GRANT ALL ON oc_autotest.* TO 'oc_autotest'@'localhost';"; fi
- composer self-update
- make install-composer-deps-dev
- cd ..
- git clone https://github.com/nextcloud/server.git --recursive --depth 1 -b $CORE_BRANCH core
- mv contacts core/apps/
Expand Down
19 changes: 15 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,17 @@ npm-init:
npm-update:
npm update

composer.phar:
curl -sS https://getcomposer.org/installer | php

install-deps: install-composer-deps-dev install-npm-deps-dev

install-composer-deps: composer.phar
php composer.phar install --no-dev -o

install-composer-deps-dev: composer.phar
php composer.phar install -o

# Building
build-js:
npm run dev
Expand All @@ -41,12 +52,12 @@ test-coverage:
npm run test:coverage

test-php:
phpunit -c phpunit.xml
phpunit -c phpunit.integration.xml
php composer.phar run test:unit
php composer.phar run test:integration

test-php-coverage:
phpunit -c phpunit.xml --coverage-clover=coverage-unit.xml
phpunit -c phpunit.integration.xml --coverage-clover=coverage-integration.xml
php composer.phar run test:unit -- --coverage-clover=coverage-unit.xml
php composer.phar run test:integration -- --coverage-clover=coverage-integration.xml

# Linting
lint:
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ If you contribute, participate or interact with this community, please respect [
This guide will help you get started:
- :dancer: :smile: [Opening a pull request](https://opensource.guide/how-to-contribute/#opening-a-pull-request)


# Thanks
- language icon by [nociconist](https://thenounproject.com/nociconist/)



9 changes: 9 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"require-dev": {
"christophwurst/nextcloud_testing": "^0.7.0"
},
"scripts": {
"test:unit": "phpunit -c phpunit.xml --fail-on-warning",
"test:integration": "phpunit -c phpunit.integration.xml --fail-on-warning"
}
}
Loading