Merge remote-tracking branch 'origin/2.5' into 2.5

ezsystems · Feb 26, 2021 · 448acc1 · 448acc1
2 parents 7f048db + 95c5d8f
commit 448acc1
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/bin/.travis/trusty/setup_ezplatform.sh b/bin/.travis/trusty/setup_ezplatform.sh
@@ -75,7 +75,10 @@ if [[ -n "${DEPENDENCY_PACKAGE_NAME}" ]]; then
         sudo mkdir -p /var/www/${BASE_PACKAGE_NAME}
     fi
     echo "> Make composer use tested dependency local checkout ${TMP_TRAVIS_BRANCH} of ${BASE_PACKAGE_NAME}"
-    composer config repositories.localDependency path /var/www/${BASE_PACKAGE_NAME}
+    REPOSITORY_PROPERTIES=$( jq -n \
+                  --arg basePackageName "/var/www/$BASE_PACKAGE_NAME" \
+                  '{"type": "path", "url": $basePackageName, "options": { "symlink": false }}' )
+    composer config repositories.localDependency "$REPOSITORY_PROPERTIES"
 
     echo "> Require ${DEPENDENCY_PACKAGE_NAME}:dev-${TMP_TRAVIS_BRANCH} as ${BRANCH_ALIAS}"
     if ! composer require --no-update "${DEPENDENCY_PACKAGE_NAME}:dev-${TMP_TRAVIS_BRANCH} as ${BRANCH_ALIAS}"; then