Skip to content

Build: Do not declare symlink strategy for the Jetpack Logo package #12480

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oskosk merged 8 commits into from
May 29, 2019
Merged

Build: Do not declare symlink strategy for the Jetpack Logo package #12480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ac66e56
Declare version in logo package
oskosk May 28, 2019
8d45e75
Do not declare symlink strategy
oskosk May 28, 2019
e6c6874
Update bundling scripts to rely on COMPOSER_MIRROR_PATH_REPOS
oskosk May 28, 2019
3263db1
Remove version from logo package
tyxla May 29, 2019
976e82f
Lower stability constraint of logo package
tyxla May 29, 2019
3733281
Update composer.lock
tyxla May 29, 2019
3b4cb7c
Add COMPOSER_MIRROR_PATH_REPOS=1 to composer install too
tyxla May 29, 2019
915ce04
Fix composer install in build jetpack script
tyxla May 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -26,10 +26,7 @@
"repositories": [
{
"type": "path",
"url": "./packages/logo",
"options": {
"symlink": true
Copy link
Member

@tyxla tyxla May 29, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

}
"url": "./packages/logo"
}
]
}
16 changes: 8 additions & 8 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions tools/build-jetpack.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 || {
Expand All @@ -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
Copy link
Member

@tyxla tyxla May 29, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 This seems to work well for me:

  • Installing automattic/jetpack-logo (dev-update/dont-symlink-packages): Mirroring from ./packages/logo

while without it for local dev I properly get:

  • Installing automattic/jetpack-logo (dev-update/dont-symlink-packages): Symlinking from ./packages/logo


echo "Purging paths included in .svnignore, .gitignore and .git itself"
# check .svnignore
Expand Down
2 changes: 1 addition & 1 deletion tools/build-release-branch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down