diff --git a/composer.json b/composer.json index f4c63be81114..4b45635ddbf3 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ }, "require": { "ext-openssl": "*", - "automattic/jetpack-logo": ">=1.0" + "automattic/jetpack-logo": "@dev" }, "require-dev": { "dealerdirect/phpcodesniffer-composer-installer": "0.5.0", @@ -26,10 +26,7 @@ "repositories": [ { "type": "path", - "url": "./packages/logo", - "options": { - "symlink": true - } + "url": "./packages/logo" } ] } diff --git a/composer.lock b/composer.lock index 7c7d2952b085..48df1ee81d8c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,15 +4,16 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "cabdf41576f13b9aeb418d860129cd9d", + "content-hash": "167f5c90d0f8c7224fdc8707e1ba107f", "packages": [ { "name": "automattic/jetpack-logo", - "version": "1.0.0", + "version": "dev-update/dont-symlink-packages", "dist": { "type": "path", "url": "./packages/logo", - "reference": "171601ad9136a28616ef0189895c54dee5e7d2df" + "reference": "9e99ef65b2600e06f2eaeaf435771194a174f40d", + "shasum": null }, "type": "library", "autoload": { @@ -23,10 +24,7 @@ "license": [ "GPL-2.0-or-later" ], - "description": "A logo for Jetpack", - "transport-options": { - "symlink": true - } + "description": "A logo for Jetpack" } ], "packages-dev": [ @@ -400,7 +398,9 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": { + "automattic/jetpack-logo": 20 + }, "prefer-stable": false, "prefer-lowest": false, "platform": { diff --git a/tools/build-jetpack.sh b/tools/build-jetpack.sh index 974c810dc200..6abbf99af4b1 100755 --- a/tools/build-jetpack.sh +++ b/tools/build-jetpack.sh @@ -63,7 +63,7 @@ hash composer 2>/dev/null || { exit 1; } -composer --cwd $TARGET_DIR install +COMPOSER_MIRROR_PATH_REPOS=1 composer install --working-dir $TARGET_DIR # Checking for yarn hash yarn 2>/dev/null || { @@ -72,7 +72,7 @@ hash yarn 2>/dev/null || { exit 1; } yarn --cwd $TARGET_DIR cache clean -yarn --cwd $TARGET_DIR run build +COMPOSER_MIRROR_PATH_REPOS=1 yarn --cwd $TARGET_DIR run build echo "Purging paths included in .svnignore, .gitignore and .git itself" # check .svnignore diff --git a/tools/build-release-branch.sh b/tools/build-release-branch.sh index a5a076ccee95..b8efe6015dfd 100755 --- a/tools/build-release-branch.sh +++ b/tools/build-release-branch.sh @@ -222,7 +222,7 @@ hash yarn 2>/dev/null || { # Start cleaning the cache. yarn cache clean -yarn run build-production +COMPOSER_MIRROR_PATH_REPOS=1 yarn run build-production echo "Done" # Prep a home to drop our new files in. Just make it in /tmp so we can start fresh each time.