inteligr8/alfresco-content-app
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-content-app.git synced 2026-09-09 18:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update branch for ADF 33366 and JS-API 4.6.0 [ci:force] (#2302)

Browse Source 
* [ci:force][auto-commit] Update @alfresco/adf-extensions to 4.7.0-33366 for branch: update-alfresco-dependencies originated from @alfresco/adf-extensions PR: 33366

* [ci:force][auto-commit] Update @alfresco/adf-core to 4.7.0-33366 for branch: update-alfresco-dependencies originated from @alfresco/adf-core PR: 33366

* [ci:force][auto-commit] Update @alfresco/adf-content-services to 4.7.0-33366 for branch: update-alfresco-dependencies originated from @alfresco/adf-content-services PR: 33366

* [ci:force][auto-commit] Update @alfresco/adf-cli to 4.7.0-33366 for branch: update-alfresco-dependencies originated from @alfresco/adf-cli PR: 33366

* [ci:force][auto-commit] Update @alfresco/adf-testing to 4.7.0-33366 for branch: update-alfresco-dependencies originated from @alfresco/adf-testing PR: 33366

* [ci:force][auto-commit] Update @alfresco/adf-extensions to 4.7.0-33394 for branch: update-alfresco-dependencies originated from @alfresco/adf-extensions PR: 33394

* [ci:force][auto-commit] Update @alfresco/adf-core to 4.7.0-33394 for branch: update-alfresco-dependencies originated from @alfresco/adf-core PR: 33394

* [ci:force][auto-commit] Update @alfresco/adf-content-services to 4.7.0-33394 for branch: update-alfresco-dependencies originated from @alfresco/adf-content-services PR: 33394

* [ci:force][auto-commit] Update @alfresco/adf-cli to 4.7.0-33394 for branch: update-alfresco-dependencies originated from @alfresco/adf-cli PR: 33394

* [ci:force][auto-commit] Update @alfresco/adf-testing to 4.7.0-33394 for branch: update-alfresco-dependencies originated from @alfresco/adf-testing PR: 33394

* [ci:force][auto-commit] Update @alfresco/adf-extensions to 4.7.0-33398 for branch: update-alfresco-dependencies originated from @alfresco/adf-extensions PR: 33398

* [ci:force][auto-commit] Update @alfresco/adf-core to 4.7.0-33398 for branch: update-alfresco-dependencies originated from @alfresco/adf-core PR: 33398

* [ci:force][auto-commit] Update @alfresco/adf-content-services to 4.7.0-33398 for branch: update-alfresco-dependencies originated from @alfresco/adf-content-services PR: 33398

* [ci:force][auto-commit] Update @alfresco/adf-cli to 4.7.0-33398 for branch: update-alfresco-dependencies originated from @alfresco/adf-cli PR: 33398

* [ci:force][auto-commit] Update @alfresco/adf-testing to 4.7.0-33398 for branch: update-alfresco-dependencies originated from @alfresco/adf-testing PR: 33398

* [ci:force][auto-commit] Update @alfresco/adf-extensions to 4.7.0-33402 for branch: update-alfresco-dependencies originated from @alfresco/adf-extensions PR: 33402

* [ci:force][auto-commit] Update @alfresco/adf-core to 4.7.0-33402 for branch: update-alfresco-dependencies originated from @alfresco/adf-core PR: 33402

* [ci:force][auto-commit] Update @alfresco/adf-content-services to 4.7.0-33402 for branch: update-alfresco-dependencies originated from @alfresco/adf-content-services PR: 33402

* [ci:force][auto-commit] Update @alfresco/adf-cli to 4.7.0-33402 for branch: update-alfresco-dependencies originated from @alfresco/adf-cli PR: 33402

* [ci:force][auto-commit] Update @alfresco/adf-testing to 4.7.0-33402 for branch: update-alfresco-dependencies originated from @alfresco/adf-testing PR: 33402

* [ci:force][auto-commit] Update @alfresco/adf-extensions to 4.7.0-33404 for branch: update-alfresco-dependencies originated from @alfresco/adf-extensions PR: 33404

* [ci:force][auto-commit] Update @alfresco/adf-core to 4.7.0-33404 for branch: update-alfresco-dependencies originated from @alfresco/adf-core PR: 33404

* [ci:force][auto-commit] Update @alfresco/adf-content-services to 4.7.0-33404 for branch: update-alfresco-dependencies originated from @alfresco/adf-content-services PR: 33404

* [ci:force][auto-commit] Update @alfresco/adf-cli to 4.7.0-33404 for branch: update-alfresco-dependencies originated from @alfresco/adf-cli PR: 33404

* [ci:force][auto-commit] Update @alfresco/adf-testing to 4.7.0-33404 for branch: update-alfresco-dependencies originated from @alfresco/adf-testing PR: 33404

* [ci:force][auto-commit] Update @alfresco/adf-extensions to 4.7.0-33408 for branch: update-alfresco-dependencies originated from @alfresco/adf-extensions PR: 33408

* [ci:force][auto-commit] Update @alfresco/adf-core to 4.7.0-33408 for branch: update-alfresco-dependencies originated from @alfresco/adf-core PR: 33408

* [ci:force][auto-commit] Update @alfresco/adf-content-services to 4.7.0-33408 for branch: update-alfresco-dependencies originated from @alfresco/adf-content-services PR: 33408

* [ci:force][auto-commit] Update @alfresco/adf-cli to 4.7.0-33408 for branch: update-alfresco-dependencies originated from @alfresco/adf-cli PR: 33408

* [ci:force][auto-commit] Update @alfresco/adf-testing to 4.7.0-33408 for branch: update-alfresco-dependencies originated from @alfresco/adf-testing PR: 33408

* [ci:force][auto-commit] Update @alfresco/adf-extensions to 4.7.0-33409 for branch: update-alfresco-dependencies originated from @alfresco/adf-extensions PR: 33409

* [ci:force][auto-commit] Update @alfresco/adf-core to 4.7.0-33409 for branch: update-alfresco-dependencies originated from @alfresco/adf-core PR: 33409

* [ci:force][auto-commit] Update @alfresco/adf-content-services to 4.7.0-33409 for branch: update-alfresco-dependencies originated from @alfresco/adf-content-services PR: 33409

* [ci:force][auto-commit] Update @alfresco/adf-cli to 4.7.0-33409 for branch: update-alfresco-dependencies originated from @alfresco/adf-cli PR: 33409

* [ci:force][auto-commit] Update @alfresco/adf-testing to 4.7.0-33409 for branch: update-alfresco-dependencies originated from @alfresco/adf-testing PR: 33409

* [ci:force][auto-commit] Update @alfresco/adf-extensions to 4.7.0-33413 for branch: update-alfresco-dependencies originated from @alfresco/adf-extensions PR: 33413

* [ci:force][auto-commit] Update @alfresco/adf-core to 4.7.0-33413 for branch: update-alfresco-dependencies originated from @alfresco/adf-core PR: 33413

* [ci:force][auto-commit] Update @alfresco/adf-content-services to 4.7.0-33413 for branch: update-alfresco-dependencies originated from @alfresco/adf-content-services PR: 33413

* [ci:force][auto-commit] Update @alfresco/adf-cli to 4.7.0-33413 for branch: update-alfresco-dependencies originated from @alfresco/adf-cli PR: 33413

* [ci:force][auto-commit] Update @alfresco/adf-testing to 4.7.0-33413 for branch: update-alfresco-dependencies originated from @alfresco/adf-testing PR: 33413

* [ci:force][auto-commit] Update @alfresco/js-api to 4.6.0 for branch: update-alfresco-dependencies originated from @alfresco/js-api PR: 33419

* [ci:force][auto-commit] Update @alfresco/adf-extensions to 4.7.0-33419 for branch: update-alfresco-dependencies originated from @alfresco/adf-extensions PR: 33419

* [ci:force][auto-commit] Update @alfresco/adf-core to 4.7.0-33419 for branch: update-alfresco-dependencies originated from @alfresco/adf-core PR: 33419

* [ci:force][auto-commit] Update @alfresco/adf-content-services to 4.7.0-33419 for branch: update-alfresco-dependencies originated from @alfresco/adf-content-services PR: 33419

* [ci:force][auto-commit] Update @alfresco/adf-cli to 4.7.0-33419 for branch: update-alfresco-dependencies originated from @alfresco/adf-cli PR: 33419

* [ci:force][auto-commit] Update @alfresco/adf-testing to 4.7.0-33419 for branch: update-alfresco-dependencies originated from @alfresco/adf-testing PR: 33419

* [ci:force][auto-commit] Update @alfresco/adf-core to 4.7.0-33423 for branch: update-alfresco-dependencies originated from @alfresco/adf-core PR: 33419

* [ci:force][auto-commit] Update @alfresco/adf-content-services to 4.7.0-33423 for branch: update-alfresco-dependencies originated from @alfresco/adf-content-services PR: 33419

* [ci:force][auto-commit] Update @alfresco/adf-cli to 4.7.0-33423 for branch: update-alfresco-dependencies originated from @alfresco/adf-cli PR: 33419

* [ci:force][auto-commit] Update @alfresco/adf-testing to 4.7.0-33423 for branch: update-alfresco-dependencies originated from @alfresco/adf-testing PR: 33419

* [ci:force][auto-commit] Update @alfresco/adf-extensions to 4.7.0-33424 for branch: update-alfresco-dependencies originated from @alfresco/adf-extensions PR: 33424

* [ci:force][auto-commit] Update @alfresco/adf-core to 4.7.0-33424 for branch: update-alfresco-dependencies originated from @alfresco/adf-core PR: 33424

* [ci:force][auto-commit] Update @alfresco/adf-content-services to 4.7.0-33424 for branch: update-alfresco-dependencies originated from @alfresco/adf-content-services PR: 33424

* [ci:force][auto-commit] Update @alfresco/adf-cli to 4.7.0-33424 for branch: update-alfresco-dependencies originated from @alfresco/adf-cli PR: 33424

* [ci:force][auto-commit] Update @alfresco/adf-testing to 4.7.0-33424 for branch: update-alfresco-dependencies originated from @alfresco/adf-testing PR: 33424

* remove deprecated imports

* try remove old docker config

* [ci:force][auto-commit] Update @alfresco/adf-extensions to 4.7.0-33428 for branch: update-alfresco-dependencies originated from @alfresco/adf-extensions PR: 33428

* [ci:force][auto-commit] Update @alfresco/adf-core to 4.7.0-33428 for branch: update-alfresco-dependencies originated from @alfresco/adf-core PR: 33428

* [ci:force][auto-commit] Update @alfresco/adf-content-services to 4.7.0-33428 for branch: update-alfresco-dependencies originated from @alfresco/adf-content-services PR: 33428

* [ci:force][auto-commit] Update @alfresco/adf-cli to 4.7.0-33428 for branch: update-alfresco-dependencies originated from @alfresco/adf-cli PR: 33428

* [ci:force][auto-commit] Update @alfresco/adf-testing to 4.7.0-33428 for branch: update-alfresco-dependencies originated from @alfresco/adf-testing PR: 33428

* [ci:force][auto-commit] Update @alfresco/adf-extensions to 4.7.0-33437 for branch: update-alfresco-dependencies originated from @alfresco/adf-extensions PR: 33437

* [ci:force][auto-commit] Update @alfresco/adf-core to 4.7.0-33437 for branch: update-alfresco-dependencies originated from @alfresco/adf-core PR: 33437

* [ci:force][auto-commit] Update @alfresco/adf-content-services to 4.7.0-33437 for branch: update-alfresco-dependencies originated from @alfresco/adf-content-services PR: 33437

* [ci:force][auto-commit] Update @alfresco/adf-cli to 4.7.0-33437 for branch: update-alfresco-dependencies originated from @alfresco/adf-cli PR: 33437

* [ci:force][auto-commit] Update @alfresco/adf-testing to 4.7.0-33437 for branch: update-alfresco-dependencies originated from @alfresco/adf-testing PR: 33437

* [ci:force][auto-commit] Update @alfresco/adf-extensions to 4.7.0-33441 for branch: update-alfresco-dependencies originated from @alfresco/adf-extensions PR: 33441

* [ci:force][auto-commit] Update @alfresco/adf-core to 4.7.0-33441 for branch: update-alfresco-dependencies originated from @alfresco/adf-core PR: 33441

* [ci:force][auto-commit] Update @alfresco/adf-content-services to 4.7.0-33441 for branch: update-alfresco-dependencies originated from @alfresco/adf-content-services PR: 33441

* [ci:force][auto-commit] Update @alfresco/adf-cli to 4.7.0-33441 for branch: update-alfresco-dependencies originated from @alfresco/adf-cli PR: 33441

* [ci:force][auto-commit] Update @alfresco/adf-testing to 4.7.0-33441 for branch: update-alfresco-dependencies originated from @alfresco/adf-testing PR: 33441

* [ci:force][auto-commit] Update @alfresco/adf-extensions to 4.7.0-33442 for branch: update-alfresco-dependencies originated from @alfresco/adf-extensions PR: 33442

* [ci:force][auto-commit] Update @alfresco/adf-core to 4.7.0-33442 for branch: update-alfresco-dependencies originated from @alfresco/adf-core PR: 33442

* [ci:force][auto-commit] Update @alfresco/adf-content-services to 4.7.0-33442 for branch: update-alfresco-dependencies originated from @alfresco/adf-content-services PR: 33442

* [ci:force][auto-commit] Update @alfresco/adf-cli to 4.7.0-33442 for branch: update-alfresco-dependencies originated from @alfresco/adf-cli PR: 33442

* [ci:force][auto-commit] Update @alfresco/adf-testing to 4.7.0-33442 for branch: update-alfresco-dependencies originated from @alfresco/adf-testing PR: 33442

* update travis script

Co-authored-by: Travis CI User <travis@example.org>
Co-authored-by: Denys Vuika <denys.vuika@gmail.com>
This commit is contained in:
Denys Vuika
2021-11-16 13:05:05 +00:00
committed by Denys Vuika
co-authored by Travis CI User Denys Vuika
parent 0f3703ef18
commit d5a5b67c7d
5 changed files with 24 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+1 -5
View File
@@ -1,7 +1,3 @@
import:
- source: Alfresco/alfresco-build-tools:.travis.docker_hub_login.yml@v1.1.1
- source: .travis/env.yml
mode: deep_merge_prepend
# ================= # =================
# merge anchor # merge anchor
# ================= # =================
@@ -58,7 +54,7 @@ jobs:
name: 'Build (without animation)' name: 'Build (without animation)'
before_script: npx @alfresco/adf-cli update-commit-sha --pointer "HEAD" --pathPackage "$(pwd)" before_script: npx @alfresco/adf-cli update-commit-sha --pointer "HEAD" --pathPackage "$(pwd)"
script: npm ci && npm run build.e2e script: npm ci && npm run build.e2e
after_success: ./scripts/ci/utils/artifact-to-s3.sh -a ./dist/app -o "$S3_DBP_FOLDER/alfresco-content-app.tar.bz2" after_success: ./scripts/ci/utils/artifact-to-s3.sh -a ./dist/app -o "$S3_DBP_FOLDER/alfresco-content-app.tar.bz2" || travis_terminate 1
cache: false cache: false
- stage: Quality and Unit tests - stage: Quality and Unit tests
package-lock.json
Generated
+18 -18
View File
@@ -5,9 +5,9 @@
"requires": true, "requires": true,
"dependencies": { "dependencies": {
"@alfresco/adf-cli": { "@alfresco/adf-cli": {
"version": "4.6.0", "version": "4.7.0-33442",
"resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-4.6.0.tgz", "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-4.7.0-33442.tgz",
"integrity": "sha512-sgZ00R2PZSHTiBK0fORVtpj+Vj5uHQldd9Rvs126UVM5TOut5jI4ZTRiO21ZrptrfJLYBMNRI+BB74ARWvypHg==", "integrity": "sha512-W6e3UA1ri9CS2HskhRAN0kQFp+KKRr2Q58akEtFUPCaAygzsQJQHmFWCiMYEjZ3ndXUWtB5tRtDVV00Zmsd+Aw==",
"dev": true, "dev": true,
"requires": { "requires": {
"@alfresco/js-api": "4.6.0", "@alfresco/js-api": "4.6.0",
@@ -30,34 +30,34 @@
} }
}, },
"@alfresco/adf-content-services": { "@alfresco/adf-content-services": {
"version": "4.6.0", "version": "4.7.0-33442",
"resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-4.6.0.tgz", "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-4.7.0-33442.tgz",
"integrity": "sha512-Rn7M2Y9oISFA9HiyUK5mhfVClWfQ2KRBb1fVtIq9M3q43O9kJA4NmIZx1vw+Fa006rZ4r7AA+cK/XU9ITWweRg==", "integrity": "sha512-EINIDQ92QMsSyhQ8BbreLXxeNsrJ75duow0fwj0xDMCfxAx5WSSRLGOeF1T6E8aqXrK45syijqtyaOH7oWyB6A==",
"requires": { "requires": {
"tslib": "^2.0.0" "tslib": "^2.0.0"
} }
}, },
"@alfresco/adf-core": { "@alfresco/adf-core": {
"version": "4.6.0", "version": "4.7.0-33442",
"resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-4.6.0.tgz", "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-4.7.0-33442.tgz",
"integrity": "sha512-r0UyxyYrVzZBAHpJoWM0bPkZkJNkGyL6QuJ02L2DbF/8CRXH0wHgvL3msNwJVfKHGnuGsoH9ROMRnUnuSMpAFA==", "integrity": "sha512-Do1evc2ZwBJN78XkAIC7F8fyyN6wgOCEDuwkS1h17tJuLJdHnHfM1Jv3xw7NZBQliBwi2dKw52bPsOxaRRVkPA==",
"requires": { "requires": {
"cropperjs": "1.5.11", "cropperjs": "1.5.11",
"tslib": "^2.0.0" "tslib": "^2.0.0"
} }
}, },
"@alfresco/adf-extensions": { "@alfresco/adf-extensions": {
"version": "4.6.0", "version": "4.7.0-33442",
"resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-4.6.0.tgz", "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-4.7.0-33442.tgz",
"integrity": "sha512-9uwbbXZ+0CT1TroodMiT1TKb1LDE8LXQnqEumI+Yf6OID/wep+/w6SpnVdg++dlNYM0UuS7MoYDve3PUtcL9Eg==", "integrity": "sha512-0TrjQ25MV6pbNTpU967pyPaus5TmHY7YhSkuPxgj5wM8xm0DwIt3HRq9pP20JxsskzQd6Np72XAm/+sgHoZu3Q==",
"requires": { "requires": {
"tslib": "^2.0.0" "tslib": "^2.0.0"
} }
}, },
"@alfresco/adf-testing": { "@alfresco/adf-testing": {
"version": "4.6.0", "version": "4.7.0-33442",
"resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-4.6.0.tgz", "resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-4.7.0-33442.tgz",
"integrity": "sha512-aAjFHPJprqBJN8sS3xpv6jRacynbzXWutHFt0/zgKrO0AiKLV0oRRndPLKWXHjaJx3dmDkl6rsd9FKqluW2cRQ==", "integrity": "sha512-IhG0Z0EI99mbhO6MPMspy23SjMbaZbk1u4Sdh7K6jIC+Wr06cTN+ouagdBzrZnOGVmAt/JZM5hSiStSdnHGqLg==",
"dev": true, "dev": true,
"requires": { "requires": {
"tslib": "^2.0.0" "tslib": "^2.0.0"
@@ -5044,9 +5044,9 @@
"dev": true "dev": true
}, },
"cookiejar": { "cookiejar": {
"version": "2.1.2", "version": "2.1.3",
"resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.2.tgz", "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.3.tgz",
"integrity": "sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA==" "integrity": "sha512-JxbCBUdrfr6AQjOXrxoTvAMJO4HBTUIlBzslcJPAz+/KT8yk53fXun51u+RenNYvad/+Vc2DIz5o9UxlCDymFQ=="
}, },
"copy-anything": { "copy-anything": {
"version": "2.0.1", "version": "2.0.1",
package.json
+5 -5
View File
@@ -24,9 +24,9 @@
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@alfresco/adf-content-services": "4.6.0", "@alfresco/adf-content-services": "4.7.0-33442",
"@alfresco/adf-core": "4.6.0", "@alfresco/adf-core": "4.7.0-33442",
"@alfresco/adf-extensions": "4.6.0", "@alfresco/adf-extensions": "4.7.0-33442",
"@alfresco/js-api": "4.6.0", "@alfresco/js-api": "4.6.0",
"@angular/animations": "10.0.4", "@angular/animations": "10.0.4",
"@angular/cdk": "^10.0.2", "@angular/cdk": "^10.0.2",
@@ -56,8 +56,8 @@
"zone.js": "~0.10.2" "zone.js": "~0.10.2"
}, },
"devDependencies": { "devDependencies": {
"@alfresco/adf-cli": "4.6.0", "@alfresco/adf-cli": "4.7.0-33442",
"@alfresco/adf-testing": "4.6.0", "@alfresco/adf-testing": "4.7.0-33442",
"@angular-custom-builders/lite-serve": "^0.2.3", "@angular-custom-builders/lite-serve": "^0.2.3",
"@angular-devkit/build-angular": "^0.1002.0", "@angular-devkit/build-angular": "^0.1002.0",
"@angular-devkit/build-ng-packagr": "^0.1002.0", "@angular-devkit/build-ng-packagr": "^0.1002.0",
src/app/ui/custom-theme.scss
-2
View File
@@ -1,5 +1,4 @@
@import '~@angular/material/theming'; @import '~@angular/material/theming';
@import '~@alfresco/adf-content-services/theming';
@import './overrides/adf-style-fixes.theme'; @import './overrides/adf-style-fixes.theme';
@import 'colors'; @import 'colors';
@@ -17,7 +16,6 @@ $primary: map-get($custom-theme, primary);
@mixin custom-theme($theme) { @mixin custom-theme($theme) {
@include angular-material-theme($theme); @include angular-material-theme($theme);
@include adf-content-services-theme($theme);
@include adf-core-theme($theme); @include adf-core-theme($theme);
@include adf-style-fixes($theme); @include adf-style-fixes($theme);
src/app/ui/theme.scss
-3
View File
@@ -1,8 +1,5 @@
@import '~@angular/material/theming'; @import '~@angular/material/theming';
@import '~@alfresco/adf-content-services/theming';
@import '~@alfresco/adf-core/theming'; @import '~@alfresco/adf-core/theming';
@import 'custom-theme'; @import 'custom-theme';
@include mat-core($alfresco-typography); @include mat-core($alfresco-typography);