X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=.github%2Fworkflows%2Ftest.yml;h=46b243244b9c02a118a059c5f4d035c2e6e449d6;hb=33eb19e5199cc9fa4d73c6675c97508e3e072ef9;hp=76fe5d6e39640a1163fd84a15755b694c901501a;hpb=12554857b410506b9e748bb0deac09d3e7393963;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 76fe5d6e3..46b243244 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -5,6 +5,8 @@ on:
     branches:
       - develop
       - master
+      - ci
+      - next
   pull_request:
     types: [synchronize, opened]
   schedule:
@@ -30,19 +32,19 @@ jobs:
           POSTGRES_HOST_AUTH_METHOD: trust
 
       ldap:
-        image: rroemhild/test-openldap
+        image: chocobozzz/docker-test-openldap
         ports:
-          - 389:389
+          - 10389:10389
 
     strategy:
       fail-fast: false
       matrix:
-        test_suite: [ misc, api-1, api-2, api-3, api-4, cli, lint, external-plugins ]
+        test_suite: [ client, api-1, api-2, api-3, api-4, cli-plugin, lint, external-plugins ]
 
     env:
       PGUSER: peertube
       PGHOST: localhost
-      NODE_PENDING_JOB_WAIT: 2000
+      NODE_PENDING_JOB_WAIT: 250
 
     steps:
       - uses: actions/checkout@v2
@@ -93,11 +95,17 @@ jobs:
       - name: Run Test
         # external-plugins tests only run on schedule
         if: github.event_name == 'schedule' || matrix.test_suite != 'external-plugins'
-        run: NODE_PENDING_JOB_WAIT=2000 npm run ci -- ${{ matrix.test_suite }}
+        run: npm run ci -- ${{ matrix.test_suite }}
 
       - name: Display errors
+        if: ${{ always() }}
         run: |
-          NODE_ENV=test node dist/scripts/parse-log.js -l error -f artifacts/*.log
+          ( \
+            test -f dist/scripts/parse-log.js && \
+            cat *-ci.log | uniq -c && \
+            NODE_ENV=test node dist/scripts/parse-log.js -l error -f artifacts/*.log \
+          ) || \
+          echo "parse-log.js script does not exist, skipping."
 
       - name: Upload logs
         uses: actions/upload-artifact@v2