X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=.github%2Fworkflows%2Ftest.yml;h=78a9a28c03e7b098e3c4196f092265864d1886b9;hb=c55d76206cd462bad7eadd0c96f1ef5b3c629f9f;hp=f0bd3ba3734b9ec6eaea05c27a873066e706cbca;hpb=07491f4b98e0548b41e21bb13a32f3f840b0ab1f;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f0bd3ba37..78a9a28c0 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -2,9 +2,6 @@ name: Test Suite
 
 on:
   push:
-    branches:
-      - develop
-      - master
   pull_request:
     types: [synchronize, opened]
   schedule:
@@ -22,7 +19,7 @@ jobs:
           - 6379:6379
 
       postgres:
-        image: postgres:9.6
+        image: postgres:10
         ports:
           - 5432:5432
         env:
@@ -30,19 +27,25 @@ jobs:
           POSTGRES_HOST_AUTH_METHOD: trust
 
       ldap:
-        image: rroemhild/test-openldap
+        image: chocobozzz/docker-test-openldap
         ports:
-          - 389:389
+          - 10389:10389
+
+      s3ninja:
+        image: chocobozzz/s3-ninja
+        ports:
+          - 9444:9000
 
     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
+      ENABLE_OBJECT_STORAGE_TESTS: true
 
     steps:
       - uses: actions/checkout@v2
@@ -55,11 +58,11 @@ jobs:
       - name: Setup system dependencies
         run: |
           sudo apt-get install postgresql-client-common redis-tools parallel
-          wget --quiet --no-check-certificate "https://download.cpy.re/ffmpeg/ffmpeg-release-4.0.3-64bit-static.tar.xz"
-          tar xf ffmpeg-release-4.0.3-64bit-static.tar.xz
+          wget --quiet --no-check-certificate "https://download.cpy.re/ffmpeg/ffmpeg-release-4.3.1-64bit-static.tar.xz"
+          tar xf ffmpeg-release-4.3.1-64bit-static.tar.xz
           mkdir -p $HOME/bin
           cp ffmpeg-*/{ffmpeg,ffprobe} $HOME/bin
-          echo "::add-path::$HOME/bin"
+          echo "$HOME/bin" >> $GITHUB_PATH
 
       - name: Cache Node.js modules
         uses: actions/cache@v2
@@ -88,16 +91,27 @@ jobs:
       - name: Set env test variable (schedule)
         if: github.event_name != 'schedule'
         run: |
-          echo "::set-env name=DISABLE_HTTP_IMPORT_TESTS::true"
+          echo "DISABLE_HTTP_IMPORT_TESTS=true" >> $GITHUB_ENV
 
       - 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 && \
+            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
         if: failure()
         with:
           name: test-storages-${{ matrix.test_suite }}
-          path: test*/logs
+          path: artifacts
+          retention-days: 7