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 4c76e62

Browse filesBrowse files
nicolas-grekasnicolas-grekas
committed
minor #38708 Put branch-version in the source for CI (nicolas-grekas)
This PR was merged into the 3.4 branch. Discussion ---------- Put branch-version in the source for CI | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - The CI must know the branch-version. We could put the version in each CI script, but that'd mean upgrading as many CI configs every 6 months. I'm trying to put the version in one file instead. Commits ------- 008f2da Put branch-version in the source for CI
2 parents d152131 + 008f2da commit 4c76e62
Copy full SHA for 4c76e62

File tree

Expand file treeCollapse file tree

3 files changed

+24
-15
lines changed
Filter options
Expand file treeCollapse file tree

3 files changed

+24
-15
lines changed

‎.appveyor.yml

Copy file name to clipboardExpand all lines: .appveyor.yml
+11-7Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ init:
1010
- SET PATH=c:\php;%PATH%
1111
- SET COMPOSER_NO_INTERACTION=1
1212
- SET SYMFONY_DEPRECATIONS_HELPER=strict
13-
- SET "SYMFONY_REQUIRE=>=3.4"
1413
- SET ANSICON=121x90 (121x90)
1514
- SET SYMFONY_PHPUNIT_VERSION=4.8
1615
- SET SYMFONY_PHPUNIT_DISABLE_RESULT_CACHE=1
@@ -49,18 +48,23 @@ install:
4948
- echo curl.cainfo=c:\php\cacert.pem >> php.ini-max
5049
- copy /Y php.ini-min php.ini
5150
- echo extension=php_openssl.dll >> php.ini
51+
- echo extension=php_curl.dll >> php.ini
52+
- echo curl.cainfo=c:\php\cacert.pem >> php.ini
5253
- cd c:\projects\symfony
53-
- IF NOT EXIST composer.phar (appveyor DownloadFile https://github.com/composer/composer/releases/download/1.9.0/composer.phar)
54-
- php composer.phar self-update
54+
- IF NOT EXIST composer.phar (appveyor DownloadFile https://github.com/composer/composer/releases/download/2.0.0/composer.phar)
55+
- php composer.phar self-update --2
5556
- copy /Y .github\composer-config.json %APPDATA%\Composer\config.json
5657
- php composer.phar global require --no-progress --no-scripts --no-plugins symfony/flex
5758
- git config --global user.email ""
5859
- git config --global user.name "Symfony"
59-
- php .github/build-packages.php "HEAD^" %APPVEYOR_REPO_BRANCH% src\Symfony\Bridge\PhpUnit
60-
- SET COMPOSER_ROOT_VERSION=%APPVEYOR_REPO_BRANCH%.x-dev
61-
- php composer.phar config platform.php 5.5.9
62-
- php composer.phar update --no-progress --no-suggest --ansi
60+
- FOR /F "tokens=* USEBACKQ" %%F IN (`bash -c "grep branch-version composer.json | grep -o '[0-9.]*'"`) DO (SET SYMFONY_VERSION=%%F)
61+
- php .github/build-packages.php "HEAD^" %SYMFONY_VERSION% src\Symfony\Bridge\PhpUnit
62+
- SET "SYMFONY_REQUIRE=>=%SYMFONY_VERSION%"
63+
- SET COMPOSER_ROOT_VERSION=%SYMFONY_VERSION%.x-dev
64+
- php composer.phar config --global platform.php 5.5.9
65+
- php composer.phar update --no-progress --ansi
6366
- php phpunit install
67+
- break > .phpunit/phpunit-4.8-0/vendor/composer/platform_check.php
6468

6569
test_script:
6670
- SET X=0

‎.travis.yml

Copy file name to clipboardExpand all lines: .travis.yml
+9-7Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ before_install:
7575
cp .github/composer-config.json ~/.composer/config.json
7676
export PHPUNIT=$(readlink -f ./phpunit)
7777
export PHPUNIT_X="$PHPUNIT --exclude-group tty,benchmark,intl-data"
78-
export COMPOSER_UP='composer update --no-progress --no-suggest --ansi'
79-
export COMPONENTS=$(find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist -printf '%h\n' | sort)
78+
export COMPOSER_UP='composer update --no-progress --ansi'
79+
export COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -printf '%h\n' | sort)
8080
find ~/.phpenv -name xdebug.ini -delete
8181
8282
if [[ $TRAVIS_PHP_VERSION = 5.* ]]; then
@@ -220,13 +220,15 @@ install:
220220
git config --global user.email ""
221221
git config --global user.name "Symfony"
222222
223+
export SYMFONY_VERSION=$(grep branch-version composer.json | grep -o '[0-9.]*')
224+
223225
if [[ ! $deps ]]; then
224-
php .github/build-packages.php HEAD^ $TRAVIS_BRANCH src/Symfony/Bridge/PhpUnit
226+
php .github/build-packages.php HEAD^ $SYMFONY_VERSION src/Symfony/Bridge/PhpUnit
225227
else
226228
export SYMFONY_DEPRECATIONS_HELPER=weak &&
227229
cp composer.json composer.json.orig &&
228230
echo -e '{\n"require":{'"$(grep phpunit-bridge composer.json)"'"php":"*"},"minimum-stability":"dev"}' > composer.json &&
229-
php .github/build-packages.php HEAD^ $TRAVIS_BRANCH $(find src/Symfony -mindepth 2 -type f -name composer.json -printf '%h\n' | sort) &&
231+
php .github/build-packages.php HEAD^ $SYMFONY_VERSION $(find src/Symfony -mindepth 2 -type f -name composer.json -printf '%h\n' | sort) &&
230232
mv composer.json composer.json.phpunit &&
231233
mv composer.json.orig composer.json
232234
fi
@@ -242,9 +244,7 @@ install:
242244
export SYMFONY_VERSION=$(git ls-remote -q --heads | grep -o '/[1-9]\.[0-9].*' | tail -n 1 | sed s/.//) &&
243245
git fetch --depth=2 origin $SYMFONY_VERSION &&
244246
git checkout -m FETCH_HEAD &&
245-
export COMPONENTS=$(find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist -printf '%h\n' | sort)
246-
else
247-
export SYMFONY_VERSION=$TRAVIS_BRANCH
247+
export COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -printf '%h\n' | sort)
248248
fi
249249
250250
- |
@@ -289,6 +289,7 @@ install:
289289
return
290290
fi
291291
phpenv global ${PHP/hhvm*/hhvm}
292+
rm vendor/composer/package-versions-deprecated -Rf
292293
if [[ $PHP = 7.* ]]; then
293294
([[ $deps ]] && cd src/Symfony/Component/HttpFoundation; composer config platform.ext-mongodb 1.6.0; composer require --dev --no-update mongodb/mongodb ~1.5.0)
294295
fi
@@ -311,6 +312,7 @@ install:
311312
tfold src/Symfony/Component/Console.tty $PHPUNIT src/Symfony/Component/Console --group tty
312313
if [[ $PHP = ${MIN_PHP%.*} ]]; then
313314
export PHP=$MIN_PHP
315+
echo '' > vendor/composer/platform_check.php
314316
echo -e "1\\n0" | xargs -I{} bash -c "tfold src/Symfony/Component/Process.sigchild{} SYMFONY_DEPRECATIONS_HELPER=weak ENHANCE_SIGCHLD={} php-$MIN_PHP/sapi/cli/php .phpunit/phpunit-4.8-1/phpunit --colors=always src/Symfony/Component/Process/"
315317
fi
316318
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
@@ -133,5 +133,8 @@
133133
"autoload-dev": {
134134
"files": [ "src/Symfony/Component/VarDumper/Resources/functions/dump.php" ]
135135
},
136-
"minimum-stability": "dev"
136+
"minimum-stability": "dev",
137+
"extra": {
138+
"branch-version": "3.4"
139+
}
137140
}

0 commit comments

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