diff --git a/.travis.yml b/.travis.yml index 0173db147..57f513972 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,6 +43,7 @@ env: global: - ADMIN_EMAIL=$ADMIN_EMAIL_REMOTE - ADMIN_PASSWORD=$ADMIN_PASSWORD_REMOTE + - CONTENT_CE_DIST_PATH="./dist/content-ce" jobs: include: @@ -54,7 +55,7 @@ jobs: name: 'Build (without animation)' before_script: npx @alfresco/adf-cli update-commit-sha --pointer "HEAD" --pathPackage "$(pwd)" 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" || travis_terminate 1 + after_success: ./scripts/ci/utils/artifact-to-s3.sh -a $CONTENT_CE_DIST_PATH -o "$S3_DBP_FOLDER/alfresco-content-app.tar.bz2" || travis_terminate 1 cache: false - stage: Quality and Unit tests @@ -82,7 +83,7 @@ jobs: - stage: e2e name: 'Test Suites: authentication,listViews,navigation,application' before_script: - - ./scripts/ci/job_hooks/before_e2e.sh "$S3_DBP_FOLDER/alfresco-content-app.tar.bz2" "./dist/app" "-a" || travis_terminate 1 + - ./scripts/ci/job_hooks/before_e2e.sh "$S3_DBP_FOLDER/alfresco-content-app.tar.bz2" "$CONTENT_CE_DIST_PATH" "-a" || travis_terminate 1 script: ./scripts/ci/jobs/affected-project-with.sh -target e2e -options "--suite=authentication,listViews,navigation,application" after_script: - ./scripts/ci/job_hooks/after_e2e.sh @@ -90,7 +91,7 @@ jobs: - stage: e2e name: 'Test Suites: search' before_script: - - ./scripts/ci/job_hooks/before_e2e.sh "$S3_DBP_FOLDER/alfresco-content-app.tar.bz2" "./dist/app" "-a" || travis_terminate 1 + - ./scripts/ci/job_hooks/before_e2e.sh "$S3_DBP_FOLDER/alfresco-content-app.tar.bz2" "$CONTENT_CE_DIST_PATH" "-a" || travis_terminate 1 script: ./scripts/ci/jobs/affected-project-with.sh -target e2e -options "--suite=search" after_script: - ./scripts/ci/job_hooks/after_e2e.sh @@ -98,7 +99,7 @@ jobs: - stage: e2e name: 'Test Suites: viewer,infoDrawer,extensions' before_script: - - ./scripts/ci/job_hooks/before_e2e.sh "$S3_DBP_FOLDER/alfresco-content-app.tar.bz2" "./dist/app" "-a" || travis_terminate 1 + - ./scripts/ci/job_hooks/before_e2e.sh "$S3_DBP_FOLDER/alfresco-content-app.tar.bz2" "$CONTENT_CE_DIST_PATH" "-a" || travis_terminate 1 script: ./scripts/ci/jobs/affected-project-with.sh -target e2e -options "--suite=viewer,infoDrawer,extensions" after_script: - ./scripts/ci/job_hooks/after_e2e.sh @@ -106,7 +107,7 @@ jobs: - stage: e2e name: 'Test Suites: shareActions' before_script: - - ./scripts/ci/job_hooks/before_e2e.sh "$S3_DBP_FOLDER/alfresco-content-app.tar.bz2" "./dist/app" "-a" || travis_terminate 1 + - ./scripts/ci/job_hooks/before_e2e.sh "$S3_DBP_FOLDER/alfresco-content-app.tar.bz2" "$CONTENT_CE_DIST_PATH" "-a" || travis_terminate 1 script: ./scripts/ci/jobs/affected-project-with.sh -target e2e -options "--suite=shareActions" after_script: - ./scripts/ci/job_hooks/after_e2e.sh @@ -114,7 +115,7 @@ jobs: - stage: e2e name: 'Test Suites: pagination' before_script: - - ./scripts/ci/job_hooks/before_e2e.sh "$S3_DBP_FOLDER/alfresco-content-app.tar.bz2" "./dist/app" "-a" || travis_terminate 1 + - ./scripts/ci/job_hooks/before_e2e.sh "$S3_DBP_FOLDER/alfresco-content-app.tar.bz2" "$CONTENT_CE_DIST_PATH" "-a" || travis_terminate 1 script: ./scripts/ci/jobs/affected-project-with.sh -target e2e -options "--suite=pagination" after_script: - ./scripts/ci/job_hooks/after_e2e.sh @@ -122,7 +123,7 @@ jobs: - stage: e2e name: 'Test Suites: actionsAvailableFilesFolders' before_script: - - ./scripts/ci/job_hooks/before_e2e.sh "$S3_DBP_FOLDER/alfresco-content-app.tar.bz2" "./dist/app" "-a" || travis_terminate 1 + - ./scripts/ci/job_hooks/before_e2e.sh "$S3_DBP_FOLDER/alfresco-content-app.tar.bz2" "$CONTENT_CE_DIST_PATH" "-a" || travis_terminate 1 script: ./scripts/ci/jobs/affected-project-with.sh -target e2e -options "--suite=actionsAvailableFilesFolders" after_script: - ./scripts/ci/job_hooks/after_e2e.sh @@ -130,7 +131,7 @@ jobs: - stage: e2e name: 'Test Suites: actionsAvailableLibraries,actionsAvailableNewMenu' before_script: - - ./scripts/ci/job_hooks/before_e2e.sh "$S3_DBP_FOLDER/alfresco-content-app.tar.bz2" "./dist/app" "-a" || travis_terminate 1 + - ./scripts/ci/job_hooks/before_e2e.sh "$S3_DBP_FOLDER/alfresco-content-app.tar.bz2" "$CONTENT_CE_DIST_PATH" "-a" || travis_terminate 1 script: ./scripts/ci/jobs/affected-project-with.sh -target e2e -options "--suite=actionsAvailableLibraries,actionsAvailableNewMenu" after_script: - ./scripts/ci/job_hooks/after_e2e.sh @@ -138,7 +139,7 @@ jobs: - stage: e2e name: 'Test Suites: actionsAvailableSpecialPermissions' before_script: - - ./scripts/ci/job_hooks/before_e2e.sh "$S3_DBP_FOLDER/alfresco-content-app.tar.bz2" "./dist/app" "-a" || travis_terminate 1 + - ./scripts/ci/job_hooks/before_e2e.sh "$S3_DBP_FOLDER/alfresco-content-app.tar.bz2" "$CONTENT_CE_DIST_PATH" "-a" || travis_terminate 1 script: ./scripts/ci/jobs/affected-project-with.sh -target e2e -options "--suite=actionsAvailableSpecialPermissions" after_script: - ./scripts/ci/job_hooks/after_e2e.sh @@ -146,7 +147,7 @@ jobs: - stage: e2e name: 'Test Suites: copyMoveActions' before_script: - - ./scripts/ci/job_hooks/before_e2e.sh "$S3_DBP_FOLDER/alfresco-content-app.tar.bz2" "./dist/app" "-a" || travis_terminate 1 + - ./scripts/ci/job_hooks/before_e2e.sh "$S3_DBP_FOLDER/alfresco-content-app.tar.bz2" "$CONTENT_CE_DIST_PATH" "-a" || travis_terminate 1 script: ./scripts/ci/jobs/affected-project-with.sh -target e2e -options "--suite=copyMoveActions" after_script: - ./scripts/ci/job_hooks/after_e2e.sh @@ -154,7 +155,7 @@ jobs: - stage: e2e name: 'Test Suites: createActions' before_script: - - ./scripts/ci/job_hooks/before_e2e.sh "$S3_DBP_FOLDER/alfresco-content-app.tar.bz2" "./dist/app" "-a" || travis_terminate 1 + - ./scripts/ci/job_hooks/before_e2e.sh "$S3_DBP_FOLDER/alfresco-content-app.tar.bz2" "$CONTENT_CE_DIST_PATH" "-a" || travis_terminate 1 script: ./scripts/ci/jobs/affected-project-with.sh -target e2e -options "--suite=createActions" after_script: - ./scripts/ci/job_hooks/after_e2e.sh @@ -162,7 +163,7 @@ jobs: - stage: e2e name: 'Test Suites: deleteActions' before_script: - - ./scripts/ci/job_hooks/before_e2e.sh "$S3_DBP_FOLDER/alfresco-content-app.tar.bz2" "./dist/app" "-a" || travis_terminate 1 + - ./scripts/ci/job_hooks/before_e2e.sh "$S3_DBP_FOLDER/alfresco-content-app.tar.bz2" "$CONTENT_CE_DIST_PATH" "-a" || travis_terminate 1 script: ./scripts/ci/jobs/affected-project-with.sh -target e2e -options "--suite=deleteActions" after_script: - ./scripts/ci/job_hooks/after_e2e.sh @@ -170,7 +171,7 @@ jobs: - stage: e2e name: 'Test Suites: editActions,favoriteActions' before_script: - - ./scripts/ci/job_hooks/before_e2e.sh "$S3_DBP_FOLDER/alfresco-content-app.tar.bz2" "./dist/app" "-a" || travis_terminate 1 + - ./scripts/ci/job_hooks/before_e2e.sh "$S3_DBP_FOLDER/alfresco-content-app.tar.bz2" "$CONTENT_CE_DIST_PATH" "-a" || travis_terminate 1 script: ./scripts/ci/jobs/affected-project-with.sh -target e2e -options "--suite=editActions,favoriteActions" after_script: - ./scripts/ci/job_hooks/after_e2e.sh @@ -178,7 +179,7 @@ jobs: - stage: e2e name: 'Test Suites: libraryActions' before_script: - - ./scripts/ci/job_hooks/before_e2e.sh "$S3_DBP_FOLDER/alfresco-content-app.tar.bz2" "./dist/app" "-a" || travis_terminate 1 + - ./scripts/ci/job_hooks/before_e2e.sh "$S3_DBP_FOLDER/alfresco-content-app.tar.bz2" "$CONTENT_CE_DIST_PATH" "-a" || travis_terminate 1 script: ./scripts/ci/jobs/affected-project-with.sh -target e2e -options "--suite=libraryActions" after_script: - ./scripts/ci/job_hooks/after_e2e.sh @@ -186,7 +187,7 @@ jobs: - stage: e2e name: 'Test Suites: uploadDownloadActions' before_script: - - ./scripts/ci/job_hooks/before_e2e.sh "$S3_DBP_FOLDER/alfresco-content-app.tar.bz2" "./dist/app" "-a" || travis_terminate 1 + - ./scripts/ci/job_hooks/before_e2e.sh "$S3_DBP_FOLDER/alfresco-content-app.tar.bz2" "$CONTENT_CE_DIST_PATH" "-a" || travis_terminate 1 script: ./scripts/ci/jobs/affected-project-with.sh -target e2e -options "--suite=uploadDownloadActions" after_script: - ./scripts/ci/job_hooks/after_e2e.sh diff --git a/angular.json b/angular.json index 908491f7f..915f98685 100644 --- a/angular.json +++ b/angular.json @@ -21,7 +21,7 @@ "brace-expansion", "d" ], - "outputPath": "dist/app", + "outputPath": "dist/content-ce", "index": "src/index.html", "main": "src/main.ts", "tsConfig": "src/tsconfig.app.json", diff --git a/package.json b/package.json index 13d2c42de..84a2f2069 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "e2e.typecheck": "tsc -p ./e2e/tsconfig.e2e.typecheck.json", "e2e": "npm run update-webdriver && protractor $SUITE", "spellcheck": "cspell '{src,e2e,projects}/**/*.ts'", - "inspect.bundle": "ng build app --prod --stats-json && npx webpack-bundle-analyzer dist/app/stats.json", + "inspect.bundle": "ng build app --prod --stats-json && npx webpack-bundle-analyzer dist/content-ce/stats.json", "validate-config": "ajv validate -s ./node_modules/@alfresco/adf-core/app.config.schema.json -d ./src/app.config.json --errors=text --verbose" }, "private": true, diff --git a/scripts/ci/jobs/affected-project-with.sh b/scripts/ci/jobs/affected-project-with.sh index 5bd707443..ac8d9e6b4 100755 --- a/scripts/ci/jobs/affected-project-with.sh +++ b/scripts/ci/jobs/affected-project-with.sh @@ -30,5 +30,5 @@ echo "Run alfresco-content-e2e protractor with options $OPTIONS" echo "./node_modules/.bin/protractor \"./protractor.conf.js\" $OPTIONS || exit 1" ./node_modules/.bin/tsc -p "./e2e/tsconfig.e2e.json" || exit 1; -./node_modules/.bin/http-server -c-1 ./dist/app -p 4200 > /dev/null &\ +./node_modules/.bin/http-server -c-1 $CONTENT_CE_DIST_PATH -p 4200 > /dev/null &\ ./node_modules/.bin/protractor "./protractor.conf.js" $OPTIONS || exit 1