X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=.github%2Fworkflows%2Ftest.yml;h=a1edde1ef00045298e0b22fd1ae773620eb031e2;hb=fd43faf2fda931cdc5ce0e6226073f10c35bbd5f;hp=fb6774ce0bf40f88ccd3814f042fd36763b74fb7;hpb=4f5a90ef5e183c54520d98af3c74f11fb3ab46a4;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index fb6774ce0..a1edde1ef 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,9 +32,9 @@ 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
@@ -42,7 +44,7 @@ jobs:
     env:
       PGUSER: peertube
       PGHOST: localhost
-      NODE_PENDING_JOB_WAIT: 2000
+      NODE_PENDING_JOB_WAIT: 250
 
     steps:
       - uses: actions/checkout@v2
@@ -93,12 +95,16 @@ 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: |
-          (test -f dist/scripts/parse-log.js && 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