mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-07 10:04:11 +00:00
Merge branch 'master' into w2p-64503_Edit-collection-Content-Source-2
This commit is contained in:
15
.travis.yml
15
.travis.yml
@@ -1,5 +1,5 @@
|
|||||||
sudo: required
|
sudo: required
|
||||||
dist: trusty
|
dist: bionic
|
||||||
|
|
||||||
env:
|
env:
|
||||||
# Install the latest docker-compose version for ci testing.
|
# Install the latest docker-compose version for ci testing.
|
||||||
@@ -12,6 +12,9 @@ env:
|
|||||||
DSPACE_REST_NAMESPACE: '/server/api'
|
DSPACE_REST_NAMESPACE: '/server/api'
|
||||||
DSPACE_REST_SSL: false
|
DSPACE_REST_SSL: false
|
||||||
|
|
||||||
|
services:
|
||||||
|
- xvfb
|
||||||
|
|
||||||
before_install:
|
before_install:
|
||||||
# Docker Compose Install
|
# Docker Compose Install
|
||||||
- curl -L https://github.com/docker/compose/releases/download/${COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
|
- 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:
|
after_script:
|
||||||
- docker-compose -f ./docker/docker-compose-travis.yml down
|
- docker-compose -f ./docker/docker-compose-travis.yml down
|
||||||
|
|
||||||
addons:
|
|
||||||
apt:
|
|
||||||
sources:
|
|
||||||
- google-chrome
|
|
||||||
packages:
|
|
||||||
- dpkg
|
|
||||||
- google-chrome-stable
|
|
||||||
|
|
||||||
language: node_js
|
language: node_js
|
||||||
|
|
||||||
node_js:
|
node_js:
|
||||||
@@ -53,8 +48,6 @@ cache:
|
|||||||
bundler_args: --retry 5
|
bundler_args: --retry 5
|
||||||
|
|
||||||
script:
|
script:
|
||||||
# Use Chromium instead of Chrome.
|
|
||||||
- export CHROME_BIN=chromium-browser
|
|
||||||
- yarn run build
|
- yarn run build
|
||||||
- yarn run ci
|
- yarn run ci
|
||||||
- cat coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js
|
- cat coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js
|
||||||
|
11
tslint.json
11
tslint.json
@@ -40,7 +40,7 @@
|
|||||||
],
|
],
|
||||||
"no-access-missing-member": false,
|
"no-access-missing-member": false,
|
||||||
"no-arg": true,
|
"no-arg": true,
|
||||||
"no-attribute-parameter-decorator": true,
|
"no-attribute-decorator": true,
|
||||||
"no-bitwise": true,
|
"no-bitwise": true,
|
||||||
"no-console": [
|
"no-console": [
|
||||||
true,
|
true,
|
||||||
@@ -81,9 +81,8 @@
|
|||||||
false
|
false
|
||||||
],
|
],
|
||||||
"prefer-const": true,
|
"prefer-const": true,
|
||||||
"pipe-naming": [
|
"pipe-prefix": [
|
||||||
true,
|
true,
|
||||||
"camelCase",
|
|
||||||
"ds"
|
"ds"
|
||||||
],
|
],
|
||||||
"quotemark": [
|
"quotemark": [
|
||||||
@@ -147,10 +146,10 @@
|
|||||||
"no-input-rename": true,
|
"no-input-rename": true,
|
||||||
"no-output-rename": true,
|
"no-output-rename": true,
|
||||||
"templates-use-public": false,
|
"templates-use-public": false,
|
||||||
"use-host-property-decorator": true,
|
"no-host-metadata-property": true,
|
||||||
"use-input-property-decorator": true,
|
"no-inputs-metadata-property": true,
|
||||||
"use-life-cycle-interface": false,
|
"use-life-cycle-interface": false,
|
||||||
"use-output-property-decorator": true,
|
"no-outputs-metadata-property": true,
|
||||||
"use-pipe-transform-interface": true
|
"use-pipe-transform-interface": true
|
||||||
// "rxjs-collapse-imports": true,
|
// "rxjs-collapse-imports": true,
|
||||||
// "rxjs-pipeable-operators-only": true,
|
// "rxjs-pipeable-operators-only": true,
|
||||||
|
Reference in New Issue
Block a user