Merge branch 'master' into w2p-64503_Edit-collection-Content-Source-2

This commit is contained in:
Kristof De Langhe
2020-01-15 17:01:39 +01:00
2 changed files with 9 additions and 17 deletions

View File

@@ -1,5 +1,5 @@
sudo: required
dist: trusty
dist: bionic
env:
# Install the latest docker-compose version for ci testing.
@@ -12,6 +12,9 @@ env:
DSPACE_REST_NAMESPACE: '/server/api'
DSPACE_REST_SSL: false
services:
- xvfb
before_install:
# Docker Compose Install
- curl -L https://github.com/docker/compose/releases/download/${COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
@@ -33,14 +36,6 @@ before_script:
after_script:
- docker-compose -f ./docker/docker-compose-travis.yml down
addons:
apt:
sources:
- google-chrome
packages:
- dpkg
- google-chrome-stable
language: node_js
node_js:
@@ -53,8 +48,6 @@ cache:
bundler_args: --retry 5
script:
# Use Chromium instead of Chrome.
- export CHROME_BIN=chromium-browser
- yarn run build
- yarn run ci
- cat coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js

View File

@@ -40,7 +40,7 @@
],
"no-access-missing-member": false,
"no-arg": true,
"no-attribute-parameter-decorator": true,
"no-attribute-decorator": true,
"no-bitwise": true,
"no-console": [
true,
@@ -81,9 +81,8 @@
false
],
"prefer-const": true,
"pipe-naming": [
"pipe-prefix": [
true,
"camelCase",
"ds"
],
"quotemark": [
@@ -147,10 +146,10 @@
"no-input-rename": true,
"no-output-rename": true,
"templates-use-public": false,
"use-host-property-decorator": true,
"use-input-property-decorator": true,
"no-host-metadata-property": true,
"no-inputs-metadata-property": true,
"use-life-cycle-interface": false,
"use-output-property-decorator": true,
"no-outputs-metadata-property": true,
"use-pipe-transform-interface": true
// "rxjs-collapse-imports": true,
// "rxjs-pipeable-operators-only": true,