Skip to content

Commit

Permalink
[ACA-4646] Upgrade to Node 18 (#3163)
Browse files Browse the repository at this point in the history
* regenerate lock file

* switch gha to node 18

* fix dependencies for Node 18

* fix the ci/cd command invokation

* update readme

* fix run-e2e command

* fix artifact name for e2e test results
  • Loading branch information
DenysVuika authored May 5, 2023
1 parent 222f487 commit efda5d1
Show file tree
Hide file tree
Showing 7 changed files with 25,680 additions and 16,454 deletions.
2 changes: 1 addition & 1 deletion .github/actions/before-e2e/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ runs:
APP_CONFIG_FILE_PATH="${{ inputs.to }}/app.config.json"
npx envsub --all $APP_CONFIG_FILE_PATH $APP_CONFIG_FILE_PATH || exit 1
echo -n " \_ Validating replaced config file ... ";
$(npm bin)/ajv validate -s ./node_modules/@alfresco/adf-core/app.config.schema.json -d $APP_CONFIG_FILE_PATH --errors=text --verbose || exit 4
npx ajv validate -s ./node_modules/@alfresco/adf-core/app.config.schema.json -d $APP_CONFIG_FILE_PATH --errors=text --verbose || exit 4
if grep -E -q '\$\{[A-Z0-9_]*\}' $APP_CONFIG_FILE_PATH; then
echo -e "\e[31m \_ ERROR: Variables are still present in the app.config.json file. Some of them might not have default value set.\e[0m";
exit 5;
Expand Down
8 changes: 6 additions & 2 deletions .github/actions/run-e2e/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ inputs:
required: false
type: string
default: 'protractor'
artifact-name:
description: Name of the artifact cache
required: true
type: string

runs:
using: "composite"
Expand Down Expand Up @@ -39,7 +43,7 @@ runs:
echo "APP_CONFIG_OAUTH2_REDIRECT_SILENT_IFRAME_URI={protocol}//{hostname}{:port}/assets/silent-refresh.html"
} >> .env
npm start content-ce > /dev/null &\
npm start > /dev/null &\
if [ ${{ inputs.test-runner }} == "playwright" ]; then
echo "Running playwright tests with options ${{ inputs.options }}"
Expand All @@ -55,5 +59,5 @@ runs:
if: ${{ always() }}
uses: actions/upload-artifact@v3
with:
name: ${{ inputs.options }}
name: ${{ inputs.artifact-name }}
path: test-results/
2 changes: 2 additions & 0 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ jobs:
- uses: ./.github/actions/run-e2e
with:
options: "--suite=${{ matrix.e2e-suites.name }}"
artifact-name: ${{ matrix.e2e-suites.name }}
- uses: ./.github/actions/after-e2e

e2es-playwright:
Expand Down Expand Up @@ -207,6 +208,7 @@ jobs:
- uses: ./.github/actions/run-e2e
with:
options: "e2e/playwright/tests/folder-rules/playwright.config.ts"
artifact-name: folder-rules
test-runner: playwright
- uses: ./.github/actions/after-e2e

Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
14
18
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@ Run the following commands:

```sh
npm install
npm start content-ce
npm start
```

### Using Local ADF

Clone the `alfresco-ng2-components` and `alfresco-content-app` repositories in the same folder, and run the following command:

```sh
npm start content-ce -- --configuration=adf
npm start -- --configuration=adf
```

Changing the ADF code results in the recompilation and hot-reloading of the ACA application.
Expand Down
Loading

0 comments on commit efda5d1

Please sign in to comment.