Merge branch '4.4' into 5.2

nicolas-grekas · nicolas-grekas · commit 639c913be03e · 2021-06-27T13:58:55.000+02:00
* 4.4:
  -
  [travis] raise concurrency
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -61,7 +61,6 @@ jobs:
           COMPOSER_HOME="$(composer config home)"
           ([ -d "$COMPOSER_HOME" ] || mkdir "$COMPOSER_HOME") && cp .github/composer-config.json "$COMPOSER_HOME/config.json"
 
-          echo COLUMNS=120 >> $GITHUB_ENV
           echo PHPUNIT="$(readlink -f ./phpunit) --exclude-group tty,benchmark,intl-data" >> $GITHUB_ENV
           echo COMPOSER_UP='composer update --no-progress --ansi' >> $GITHUB_ENV
 
@@ -150,6 +149,7 @@ jobs:
             local ok=0
             local title="$1 $FLIP"
             local start=$(date -u +%s)
+            export COLUMNS=120
             OUTPUT=$(bash -xc "$2" 2>&1) || ok=1
             local end=$(date -u +%s)
 
diff --git a/.travis.yml b/.travis.yml
@@ -118,6 +118,6 @@ install:
     - ./phpunit install
 
 script:
-    - echo "$COMPONENTS" | parallel --gnu "tfold {} ./phpunit --exclude-group tty,benchmark,intl-data {}"
+    - echo "$COMPONENTS" | parallel --gnu -j +3 "tfold {} ./phpunit --exclude-group tty,benchmark,intl-data {}"
     - tfold src/Symfony/Component/Console.tty ./phpunit src/Symfony/Component/Console --group tty
     - tfold src/Symfony/Bridge/Twig.tty ./phpunit src/Symfony/Bridge/Twig --group tty
