Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WEBUI-1350: node js upgrade rebase code in lts2023 from lts2021-3.1.x #2147

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 42 additions & 34 deletions .github/workflows/a11y.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:
PACKAGES_AUTH_USER:
description: 'PACKAGES_AUTH_USER'
required: true
PACKAGES_AUTH_TOKEN:
PACKAGES_AUTH_TOKEN:
description: 'PACKAGES_AUTH_TOKEN'
required: true

Expand All @@ -29,43 +29,51 @@ env:

jobs:
a11y:
runs-on: ubuntu-latest
runs-on: [self-hosted, master]
steps:
- uses: actions/checkout@v2
with:
ref: ${{ env.BRANCH_NAME }}
- uses: actions/checkout@v2
with:
ref: ${{ env.BRANCH_NAME }}

- run: git config user.name "nuxeo-webui-jx-bot" && git config user.email "[email protected]"
- run: git config user.name "nuxeo-webui-jx-bot" && git config user.email "[email protected]"

- uses: actions/setup-node@v3
with:
registry-url: ${{ env.NPM_REPOSITORY }}
node-version: 14
scope: '@nuxeo'
- uses: actions/setup-node@v3
with:
registry-url: ${{ env.NPM_REPOSITORY }}
node-version: 18
scope: '@nuxeo'

- uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: '17'
- name: Install Web UI
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_PACKAGES_TOKEN }}
run: |
npm install
pushd packages/nuxeo-web-ui-ftest
npm install
popd
pushd packages/nuxeo-designer-catalog
npm install
popd

- name: 'Update settings.xml with server configuration'
run: |
echo '<settings>
<servers>
<server>
<id>maven-internal</id>
<username>${{ secrets.PACKAGES_AUTH_USER }}</username>
<password>${{ secrets.PACKAGES_AUTH_TOKEN }}</password>
</server>
</servers>
</settings>' > ~/.m2/settings.xml
- uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: '17'

- name: Web UI build
run: mvn -B -ntp install
- name: 'Update settings.xml with server configuration'
run: |
echo '<settings>
<servers>
<server>
<id>maven-internal</id>
<username>${{ secrets.PACKAGES_AUTH_USER }}</username>
<password>${{ secrets.PACKAGES_AUTH_TOKEN }}</password>
</server>
</servers>
</settings>' > ~/.m2/settings.xml

#==================================================================================================================
# this line of code has been commented on due to some driver issues, we will resume it once WEBUI-1266 is resolved.
#==================================================================================================================
# - name: A11y checks
# run: mvn -B -ntp -f plugin/a11y install
#==================================================================================================================
- name: Web UI build
run: mvn -B -ntp install

- name: A11y checks
run: mvn -B -ntp -f plugin/a11y install
60 changes: 26 additions & 34 deletions .github/workflows/cross-repo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -170,40 +170,32 @@ jobs:
</server>
</servers>
</settings>' > ~/.m2/settings.xml

#==================================================================================================================
# this line of code has been commented on due to some driver issues, we will resume it once WEBUI-1267 is resolved.
#==================================================================================================================
# - name: Nuxeo package build and Ftests
# env:
# RUN_ALL: ${{ github.event.inputs.run_all }}
# BAIL: ${{ github.event.inputs.bail }}
# run: |
# profiles=()
# if [ ${{ github.event.inputs.skip_ftests }} = "false" ]
# then
# profiles+=('ftest')
# fi
# if ${{ github.event.inputs.generate_metrics }}
# then
# profiles+=('metrics')
# fi
# active_profiles=""
# if [ ${#profiles[@]} -gt 0 ]
# then
# active_profiles="-P$(printf -v active_profiles '%s,' "${profiles[@]}" && echo "${active_profiles%,}")"
# fi
# mvn install -ntp $active_profiles -DskipInstall
#==================================================================================================================

#==================================================================================================================
# this line of code has been commented on due to some driver issues, we will resume it once WEBUI-1266 is resolved.
#==================================================================================================================
# - name: A11y checks
# if: ${{ github.event.inputs.skip_a11y == 'false' }}
# run: |
# mvn -B -nsu -f plugin/a11y -ntp install
#==================================================================================================================

- name: Nuxeo package build and Ftests
env:
RUN_ALL: ${{ github.event.inputs.run_all }}
BAIL: ${{ github.event.inputs.bail }}
run: |
profiles=()
if [ ${{ github.event.inputs.skip_ftests }} = "false" ]
then
profiles+=('ftest')
fi
if ${{ github.event.inputs.generate_metrics }}
then
profiles+=('metrics')
fi
active_profiles=""
if [ ${#profiles[@]} -gt 0 ]
then
active_profiles="-P$(printf -v active_profiles '%s,' "${profiles[@]}" && echo "${active_profiles%,}")"
fi
mvn install -ntp $active_profiles -DskipInstall

- name: A11y checks
if: ${{ github.event.inputs.skip_a11y == 'false' }}
run: |
mvn -B -nsu -f plugin/a11y -ntp install

- name: Archive cucumber reports
if: ${{ always() }}
Expand Down
28 changes: 19 additions & 9 deletions .github/workflows/ftest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ jobs:
with:
registry-url: ${{ env.NPM_REPOSITORY }}
scope: '@nuxeo'
node-version: 18

- uses: actions/setup-java@v2
with:
Expand Down Expand Up @@ -94,6 +95,19 @@ jobs:
popd
popd

- name: add .npmrc
run: |
pushd /tmp/_temp/
ls
rm .npmrc
touch .npmrc
popd
echo '
packages.nuxeo.com/repository/npm-public/:_auth=${NODE_AUTH_TOKEN}
@nuxeo:registry=https://packages.nuxeo.com/repository/npm-public/
always-auth=true
' >> /tmp/_temp/.npmrc

- name: Link elements to Web UI
run: |
npm install --no-package-lock --@nuxeo:registry="${{ env.NPM_REPOSITORY }}" nuxeo-elements/core/${ELEMENTS_CORE}
Expand All @@ -113,15 +127,11 @@ jobs:
</servers>
</settings>' > ~/.m2/settings.xml

#==================================================================================================================
# this line of code has been commented on due to some driver issues, we will resume it once WEBUI-1267 is resolved.
#==================================================================================================================
# - name: Functional tests
# env:
# RUN_ALL: false
# BAIL: 0
# run: mvn -ntp install -Pftest -DskipInstall
#==================================================================================================================
- name: Functional tests
env:
RUN_ALL: false
BAIL: 0
run: mvn -ntp install -Pftest -DskipInstall

- name: Archive cucumber reports
if: ${{ always() }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- uses: actions/setup-node@v3
with:
registry-url: 'https://packages.nuxeo.com/repository/npm-public/'
node-version: 14
node-version: 18
scope: '@nuxeo'

- name: Install
Expand Down
42 changes: 17 additions & 25 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,31 +22,23 @@ jobs:
with:
branch: maintenance-3.1.x

#==================================================================================================================
# this line of code has been commented on due to some driver issues, we will resume it once WEBUI-1266 is resolved.
#==================================================================================================================
# a11y:
# uses: nuxeo/nuxeo-web-ui/.github/workflows/[email protected]
# secrets:
# NPM_PACKAGES_TOKEN: ${{ secrets.NPM_PACKAGES_TOKEN }}
# PACKAGES_AUTH_USER: ${{ secrets.PACKAGES_AUTH_USER }}
# PACKAGES_AUTH_TOKEN: ${{ secrets.PACKAGES_AUTH_TOKEN }}
# with:
# branch: maintenance-3.1.x
#==================================================================================================================

#==================================================================================================================
# this line of code has been commented on due to some driver issues, we will resume it once WEBUI-1267 is resolved.
#==================================================================================================================
# ftest:
# uses: nuxeo/nuxeo-web-ui/.github/workflows/[email protected]
# secrets:
# NPM_PACKAGES_TOKEN: ${{ secrets.NPM_PACKAGES_TOKEN }}
# PACKAGES_AUTH_USER: ${{ secrets.PACKAGES_AUTH_USER }}
# PACKAGES_AUTH_TOKEN: ${{ secrets.PACKAGES_AUTH_TOKEN }}
# with:
# branch: maintenance-3.1.x
#==================================================================================================================
a11y:
uses: nuxeo/nuxeo-web-ui/.github/workflows/[email protected]
secrets:
NPM_PACKAGES_TOKEN: ${{ secrets.NPM_PACKAGES_TOKEN }}
PACKAGES_AUTH_USER: ${{ secrets.PACKAGES_AUTH_USER }}
PACKAGES_AUTH_TOKEN: ${{ secrets.PACKAGES_AUTH_TOKEN }}
with:
branch: maintenance-3.1.x

ftest:
uses: nuxeo/nuxeo-web-ui/.github/workflows/[email protected]
secrets:
NPM_PACKAGES_TOKEN: ${{ secrets.NPM_PACKAGES_TOKEN }}
PACKAGES_AUTH_USER: ${{ secrets.PACKAGES_AUTH_USER }}
PACKAGES_AUTH_TOKEN: ${{ secrets.PACKAGES_AUTH_TOKEN }}
with:
branch: maintenance-3.1.x

build:
needs: [lint, test]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/preview.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
steps:
- uses: actions/setup-node@v3
with:
node-version: 14
node-version: 18
registry-url: 'https://packages.nuxeo.com/repository/npm-public/'
scope: '@nuxeo'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/promote.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
steps:
- uses: actions/setup-node@v3
with:
node-version: 14
node-version: 18
registry-url: 'https://packages.nuxeo.com/repository/npm-public/'
scope: '@nuxeo'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
with:
registry-url: 'https://packages.nuxeo.com/repository/npm-public/'
scope: '@nuxeo'
node-version: 14
node-version: 18

- name: Install
env:
Expand Down
28 changes: 0 additions & 28 deletions addons/nuxeo-csv/ftest/features/step_definitions/csv-import.js

This file was deleted.

7 changes: 0 additions & 7 deletions addons/nuxeo-spreadsheet/ftest/.eslintrc

This file was deleted.

This file was deleted.

Loading
Loading