-
Notifications
You must be signed in to change notification settings - Fork 149
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #754 from Alfresco/development
ACA 1.5 update
- Loading branch information
Showing
470 changed files
with
42,446 additions
and
27,773 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| node_modules | ||
| src/assets/i18n | ||
| e2e | ||
| /angular.json |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "singleQuote": true | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,33 +1,40 @@ | ||
| dist: trusty | ||
| sudo: required | ||
|
|
||
| services: | ||
| - docker | ||
|
|
||
| addons: | ||
| chrome: stable | ||
|
|
||
| artifacts: | ||
| paths: | ||
| - e2e-output | ||
| target_paths: | ||
| - /${TRAVIS_BUILD_NUMBER} | ||
| language: node_js | ||
| node_js: | ||
| - "8" | ||
|
|
||
| - '8' | ||
| before_script: | ||
| # Disable services enabled by default | ||
| - sudo /etc/init.d/postgresql stop | ||
|
|
||
| before_install: | ||
| - npm install -g npm@latest | ||
| - export DISPLAY=:99.0 | ||
| - sh -e /etc/init.d/xvfb start | ||
| - sleep 3 # give xvfb some time to start | ||
|
|
||
| - sleep 3 | ||
| jobs: | ||
| include: | ||
| - stage: test | ||
| script: npm run lint && npm run spellcheck | ||
| name: 'Code quality checks' | ||
| script: | ||
| - npm run lint | ||
| - npm run spellcheck | ||
| - npm run format:check | ||
| - stage: test | ||
| name: 'Unit tests' | ||
| script: | ||
| - npm run test:ci | ||
| - bash <(curl -s https://codecov.io/bash) -X gcov | ||
| - stage: e2e | ||
| name: 'Nginx' | ||
| script: npm run build && npm run e2e:docker | ||
| - stage: e2e | ||
| name: 'Tomcat' | ||
| script: npm run build.tomcat.e2e && npm run docker.tomcat.e2e |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,13 @@ | ||
| { | ||
| "javascript.preferences.quoteStyle": "single", | ||
| "typescript.preferences.quoteStyle": "single" | ||
| "javascript.preferences.quoteStyle": "single", | ||
| "javascript.preferences.importModuleSpecifier": "relative", | ||
| "typescript.preferences.quoteStyle": "single", | ||
| "typescript.preferences.importModuleSpecifier": "relative", | ||
| "editor.formatOnSave": true, | ||
| "[html]": { | ||
| "editor.formatOnSave": false | ||
| }, | ||
| "[json]": { | ||
| "editor.formatOnSave": false | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,13 @@ | ||
| FROM nginx:stable-alpine | ||
| LABEL version="1.3" | ||
| LABEL version="1.4" | ||
| LABEL maintainer="Denys Vuika <[email protected]>" | ||
|
|
||
| COPY nginx.conf /etc/nginx/nginx.conf | ||
|
|
||
| COPY ./docker-entrypoint.sh / | ||
| RUN chmod +x /docker-entrypoint.sh | ||
|
|
||
| WORKDIR /usr/share/nginx/html | ||
| COPY dist/app/ . | ||
|
|
||
| ENTRYPOINT [ "/docker-entrypoint.sh" ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| npm run build -- --base-href ./ | ||
|
|
||
| node -e " | ||
| const fs = require('fs'); | ||
| const config = require('./dist/app/app.config.json'); | ||
| config.baseShareUrl = 'http://localhost:4000/content-app'; | ||
| fs.writeFileSync( | ||
| './dist/app/app.config.json', | ||
| JSON.stringify(config, null, 2) | ||
| ); | ||
| " | ||
|
|
||
| jar -cvf docker/tomcat/artifacts/content-app.war -C dist/app/ . |
Oops, something went wrong.