8000 Merge branch '5.1' into 5.x · symfony/symfony@525900a · GitHub
[go: up one dir, main page]
Skip to content

Commit 525900a

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '5.1' into 5.x
* 5.1: [travis] Fix location of composer home
2 parents 72a6f84 + a6dd1db commit 525900a

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

‎.github/workflows/tests.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,8 @@ jobs:
112112

113113
- name: Configure composer
114114
run: |
115-
([ -d ~/.composer ] || mkdir ~/.composer) && cp .github/composer-config.json ~/.composer/config.json
115+
COMPOSER_HOME="$(composer config home)"
116+
([ -d "$COMPOSER_HOME" ] || mkdir "$COMPOSER_HOME") && cp .github/composer-config.json "$COMPOSER_HOME/config.json"
116117
echo "COMPOSER_ROOT_VERSION=$(grep branch-version composer.json | grep -o '[0-9.]*').x-dev" >> $GITHUB_ENV
117118
118119
- name: Determine composer cache directory

‎.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@ before_install:
6060
[ -d /usr/lib/openldap ] && ln -s /usr/lib/openldap /tmp/slapd-modules || ln -s /usr/lib/ldap /tmp/slapd-modules
6161
fi
6262 slapd -f src/Symfony/Component/Ldap/Tests/Fixtures/conf/slapd.conf -h ldap://localhost:3389 &
63-
[ -d ~/.composer ] || mkdir ~/.composer
64-
cp .github/composer-config.json ~/.composer/config.json
63+
cp .github/composer-config.json "$(composer config home)/config.json"
6564
export PHPUNIT=$(readlink -f ./phpunit)
6665
export PHPUNIT_X="$PHPUNIT --exclude-group tty,benchmark,intl-data"
6766
export COMPOSER_UP='composer update --no-progress --ansi'

0 commit comments

Comments
 (0)
0