Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 138f611

Browse filesBrowse files
nicolas-grekasnicolas-grekas
committed
Merge branch '3.4' into 4.4
* 3.4: Put branch-version in the source for CI
2 parents c2f4426 + 4c76e62 commit 138f611
Copy full SHA for 138f611

File tree

Expand file treeCollapse file tree

3 files changed

+19
-14
lines changed
Filter options
Expand file treeCollapse file tree

3 files changed

+19
-14
lines changed

‎.appveyor.yml

Copy file name to clipboardExpand all lines: .appveyor.yml
+8-7Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ cache:
99
init:
1010
- SET PATH=c:\php;%PATH%
1111
- SET COMPOSER_NO_INTERACTION=1
12-
- SET SYMFONY_DEPRECATIONS_HELPER=max[indirect]=7
13-
- SET "SYMFONY_REQUIRE=>=4.2"
12+
- SET SYMFONY_DEPRECATIONS_HELPER=strict
1413
- SET ANSICON=121x90 (121x90)
1514
- SET SYMFONY_PHPUNIT_DISABLE_RESULT_CACHE=1
1615
- REG ADD "HKEY_CURRENT_USER\Software\Microsoft\Command Processor" /v DelayedExpansion /t REG_DWORD /d 1 /f
@@ -43,15 +42,17 @@ install:
4342
- echo extension=php_curl.dll >> php.ini-max
4443
- copy /Y php.ini-max php.ini
4544
- cd c:\projects\symfony
46-
- IF NOT EXIST composer.phar (appveyor DownloadFile https://github.com/composer/composer/releases/download/1.9.0/composer.phar)
47-
- php composer.phar self-update
45+
- IF NOT EXIST composer.phar (appveyor DownloadFile https://github.com/composer/composer/releases/download/2.0.0/composer.phar)
46+
- php composer.phar self-update --2
4847
- copy /Y .github\composer-config.json %APPDATA%\Composer\config.json
4948
- php composer.phar global require --no-progress --no-scripts --no-plugins symfony/flex
5049
- git config --global user.email ""
5150
- git config --global user.name "Symfony"
52-
- php .github/build-packages.php "HEAD^" %APPVEYOR_REPO_BRANCH% src\Symfony\Bridge\PhpUnit src\Symfony\Contracts
53-
- SET COMPOSER_ROOT_VERSION=%APPVEYOR_REPO_BRANCH%.x-dev
54-
- php composer.phar update --no-progress --no-suggest --ansi
51+
- FOR /F "tokens=* USEBACKQ" %%F IN (`bash -c "grep branch-version composer.json | grep -o '[0-9.]*'"`) DO (SET SYMFONY_VERSION=%%F)
52+
- php .github/build-packages.php "HEAD^" %SYMFONY_VERSION% src\Symfony\Bridge\PhpUnit src\Symfony\Contracts
53+
- SET "SYMFONY_REQUIRE=>=%SYMFONY_VERSION%"
54+
- SET COMPOSER_ROOT_VERSION=%SYMFONY_VERSION%.x-dev
55+
- php composer.phar update --no-progress --ansi
5556
- php phpunit install
5657

5758
test_script:

‎.travis.yml

Copy file name to clipboardExpand all lines: .travis.yml
+7-6Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ before_install:
6464
cp .github/composer-config.json ~/.composer/config.json
6565
export PHPUNIT=$(readlink -f ./phpunit)
6666
export PHPUNIT_X="$PHPUNIT --exclude-group tty,benchmark,intl-data"
67-
export COMPOSER_UP='composer update --no-progress --no-suggest --ansi'
67+
export COMPOSER_UP='composer update --no-progress --ansi'
6868
export COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -printf '%h\n' | sort)
6969
find ~/.phpenv -name xdebug.ini -delete
7070
@@ -201,14 +201,15 @@ install:
201201
git config --global user.email ""
202202
git config --global user.name "Symfony"
203203
204+
export SYMFONY_VERSION=$(grep branch-version composer.json | grep -o '[0-9.]*')
205+
204206
if [[ ! $deps ]]; then
205-
php .github/build-packages.php HEAD^ $TRAVIS_BRANCH src/Symfony/Bridge/PhpUnit src/Symfony/Contracts
206-
composer remove --dev --no-update paragonie/sodium_compat
207+
php .github/build-packages.php HEAD^ $SYMFONY_VERSION src/Symfony/Bridge/PhpUnit src/Symfony/Contracts
207208
else
208209
export SYMFONY_DEPRECATIONS_HELPER=weak &&
209210
cp composer.json composer.json.orig &&
210211
echo -e '{\n"require":{'"$(grep phpunit-bridge composer.json)"'"php":"*"},"minimum-stability":"dev"}' > composer.json &&
211-
php .github/build-packages.php HEAD^ $TRAVIS_BRANCH $(find src/Symfony -mindepth 2 -type f -name composer.json -printf '%h\n' | sort) &&
212+
php .github/build-packages.php HEAD^ $SYMFONY_VERSION $(find src/Symfony -mindepth 2 -type f -name composer.json -printf '%h\n' | sort) &&
212213
mv composer.json composer.json.phpunit &&
213214
mv composer.json.orig composer.json
214215
fi
@@ -225,8 +226,6 @@ install:
225226
git fetch --depth=2 origin $SYMFONY_VERSION &&
226227
git checkout -m FETCH_HEAD &&
227228
export COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -printf '%h\n' | sort)
228-
else
229-
export SYMFONY_VERSION=$TRAVIS_BRANCH
230229
fi
231230
232231
- |
@@ -270,6 +269,7 @@ install:
270269
return
271270
fi
272271
phpenv global $PHP
272+
rm vendor/composer/package-versions-deprecated -Rf
273273
([[ $deps ]] && cd src/Symfony/Component/HttpFoundation; cp composer.json composer.bak; composer config platform.ext-mongodb 1.6.99; composer require --dev --no-update mongodb/mongodb ~1.5.0)
274274
tfold 'composer update' $COMPOSER_UP
275275
tfold 'phpunit install' ./phpunit install
@@ -318,6 +318,7 @@ install:
318318
319319
if [[ $PHP = ${MIN_PHP%.*} ]]; then
320320
export PHP=$MIN_PHP
321+
echo '' > vendor/composer/platform_check.php
321322
tfold src/Symfony/Component/Process.sigchild SYMFONY_DEPRECATIONS_HELPER=weak php-$MIN_PHP/sapi/cli/php ./phpunit --colors=always src/Symfony/Component/Process/
322323
fi
323324
fi

‎composer.json

Copy file name to clipboardExpand all lines: composer.json
+4-1Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,5 +160,8 @@
160160
"url": "src/Symfony/Contracts"
161161
}
162162
],
163-
"minimum-stability": "dev"
163+
"minimum-stability": "dev",
164+
"extra": {
165+
"branch-version": "4.4"
166+
}
164167
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.