Merge branch 'maintenance-3.1.x' into task-WEBUI-1350-NodeJS-Upgrade-…

…Rebase-code-in-LTS2023-from-LTS2021-3.1.x
nuxeo · Jan 15, 2024 · 5d23424 · 5d23424
2 parents 9fe0cb0 + 114afe5
commit 5d23424
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 31 deletions.
diff --git a/.github/workflows/ftest.yaml b/.github/workflows/ftest.yaml
@@ -127,11 +127,15 @@ jobs:
               </servers>
               </settings>' > ~/.m2/settings.xml
 
-      - name: Functional tests
-        env:
-          RUN_ALL: false
-          BAIL: 0
-        run: mvn -ntp install -Pftest -DskipInstall
+      #==================================================================================================================
+      # 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: Archive cucumber reports
         if: ${{ always() }}

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -22,34 +22,26 @@ 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]
+    needs: [lint, test, a11y, ftest]
     runs-on: [self-hosted, master]
     steps:
       - uses: actions/checkout@v2