Merge branch '3.4' into 4.4

nicolas-grekas · nicolas-grekas · commit e6250eabcfaa · 2020-11-02T15:31:22.000+01:00
* 3.4:
  Fix CI
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -48,7 +48,7 @@ install:
     - php composer.phar global require --no-progress --no-scripts --no-plugins symfony/flex
     - git config --global user.email ""
     - git config --global user.name "Symfony"
-    - FOR /F "tokens=* USEBACKQ" %%F IN (`bash -c "grep branch-version composer.json | grep -o '[0-9.]*'"`) DO (SET SYMFONY_VERSION=%%F)
+    - FOR /F "tokens=* USEBACKQ" %%F IN (`bash -c "grep branch-version composer.json | grep -o '[0-9.x]*'"`) DO (SET SYMFONY_VERSION=%%F)
     - php .github/build-packages.php "HEAD^" %SYMFONY_VERSION% src\Symfony\Bridge\PhpUnit src\Symfony\Contracts
     - SET "SYMFONY_REQUIRE=>=%SYMFONY_VERSION%"
     - SET COMPOSER_ROOT_VERSION=%SYMFONY_VERSION%.x-dev
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -57,7 +57,7 @@ jobs:
                 run: |
                     COMPOSER_HOME="$(composer config home)"
                     ([ -d "$COMPOSER_HOME" ] || mkdir "$COMPOSER_HOME") && cp .github/composer-config.json "$COMPOSER_HOME/config.json"
-                    echo "COMPOSER_ROOT_VERSION=$(grep branch-version composer.json | grep -o '[0-9.]*').x-dev" >> $GITHUB_ENV
+                    echo "COMPOSER_ROOT_VERSION=$(grep branch-version composer.json | grep -o '[0-9.x]*').x-dev" >> $GITHUB_ENV
 
             -   name: Determine composer cache directory
                 id: composer-cache
diff --git a/.travis.yml b/.travis.yml
@@ -199,7 +199,7 @@ install:
       git config --global user.email ""
       git config --global user.name "Symfony"
 
-      export SYMFONY_VERSION=$(grep branch-version composer.json | grep -o '[0-9.]*')
+      export SYMFONY_VERSION=$(grep branch-version composer.json | grep -o '[0-9.x]*')
 
       if [[ ! $deps ]]; then
           php .github/build-packages.php HEAD^ $SYMFONY_VERSION src/Symfony/Bridge/PhpUnit src/Symfony/Contracts
