Skip to content

Commit

Permalink
[ACS-4535] cleanup unused dependencies (#3064)
Browse files Browse the repository at this point in the history
* cleanup unused dependencies

* more cleanup
  • Loading branch information
DenysVuika authored Mar 16, 2023
1 parent c329490 commit 25f9a03
Show file tree
Hide file tree
Showing 8 changed files with 41 additions and 1,481 deletions.
22 changes: 9 additions & 13 deletions .github/actions/adf-linking/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,14 @@ runs:
shell: bash
run: |
if [[ $COMMIT_MESSAGE == *"[link-adf:"* ]]; then
echo "BUILD_OPTS=--configuration=adfprod,e2e" >> $GITHUB_ENV
echo "TEST_OPTS=--configuration=adfprod" >> $GITHUB_ENV
echo "E2E_PROTRACTOR_OPTS=--with-local-adf" >> $GITHUB_ENV
echo "E2E_TSCONFIG=tsconfig.e2e.adf.json" >> $GITHUB_ENV
BRANCH=`echo $COMMIT_MESSAGE | grep -o "\[link-adf\:[^]]*\]" | sed -e 's#\[link-adf:##g' | sed -e 's#\]##g'`
echo "Checking out ADF's branch: ${BRANCH}" && \
git clone https://github.com/Alfresco/alfresco-ng2-components.git --depth=1 --branch ${BRANCH} ../alfresco-ng2-components
# ADF theming needs it the styling
CWD=`pwd`
cd ../alfresco-ng2-components
npm install @angular/material
cd $CWD
echo "BUILD_OPTS=--configuration=adfprod,e2e" >> $GITHUB_ENV
echo "TEST_OPTS=--configuration=adfprod" >> $GITHUB_ENV
echo "E2E_PROTRACTOR_OPTS=--with-local-adf" >> $GITHUB_ENV
echo "E2E_TSCONFIG=tsconfig.e2e.adf.json" >> $GITHUB_ENV
BRANCH=`echo $COMMIT_MESSAGE | grep -o "\[link-adf\:[^]]*\]" | sed -e 's#\[link-adf:##g' | sed -e 's#\]##g'`
echo "Cloning ADF with branch ${BRANCH}" && \
git clone https://github.com/Alfresco/alfresco-ng2-components.git --depth=1 --branch ${BRANCH} ../alfresco-ng2-components
else
echo -e "\e[32mUsing ADF from installed node_modules.\e[0m"
echo -e "Using ADF from installed node_modules."
fi ;
2 changes: 1 addition & 1 deletion .github/actions/download-job-artifact/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ runs:
using: "composite"
steps:
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1
uses: aws-actions/configure-aws-credentials@v2
with:
aws-access-key-id: ${{ inputs.aws-access-key-id }}
aws-secret-access-key: ${{ inputs.aws-secret-access-key }}
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/run-e2e/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ runs:
shell: bash
run: |
./node_modules/.bin/tsc -p "./e2e/$E2E_TSCONFIG" || exit 1;
./node_modules/.bin/http-server -c-1 $CONTENT_CE_DIST_PATH -p 4200 > /dev/null &\
npx http-server -c-1 $CONTENT_CE_DIST_PATH -p 4200 > /dev/null &\
if [ ${{ inputs.test-runner }} == "playwright" ]; then
echo "Running playwright tests with options ${{ inputs.options }}"
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/upload-job-artifact/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ runs:
using: "composite"
steps:
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1
uses: aws-actions/configure-aws-credentials@v2
with:
aws-access-key-id: ${{ inputs.aws-access-key-id }}
aws-secret-access-key: ${{ inputs.aws-secret-access-key }}
Expand Down
27 changes: 0 additions & 27 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -238,24 +238,6 @@
}
}
},
"lite-serve": {
"builder": "@angular-custom-builders/lite-serve:dist-serve",
"options": {
"publicHost": "http://localhost:4200",
"browserTarget": "content-ce:build"
},
"configurations": {
"standalone": {
"watch": true
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "content-ce:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
Expand Down Expand Up @@ -349,15 +331,6 @@
}
}
},
"e2elite": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "protractor.conf.js",
"webdriverUpdate": false,
"devServerTarget": "content-ce:lite-serve",
"invertGrep": true
}
},
"lint": {
"builder": "@angular-eslint/builder:lint",
"options": {
Expand Down
54 changes: 0 additions & 54 deletions e2e/lite-server-proxy.js

This file was deleted.

Loading

0 comments on commit 25f9a03

Please sign in to comment.