-
-
Notifications
You must be signed in to change notification settings - Fork 1.5k
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.
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
Magento: allow subdirectory and create variable for bin/magento #3460
Conversation
so it can be overridden to a custom location
In what situation would bin/magento be in a custom path? |
In combination with #3461 maybe I should combine this into one PR @peterjaap |
Ah, here it is :D |
I'm fine having two and merge them together :-) |
recipe/magento2.php
Outdated
set('magento_version', function () { | ||
// detect version | ||
$versionOutput = run('{{bin/php}} {{release_or_current_path}}/bin/magento --version'); | ||
$versionOutput = run('{{bin/php}} {{release_or_current_path}}/{{bin/magento}} --version'); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Isn't the {{release_or_current_path}}
already added to {{bin/magento}}
on line 78?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good catch, looks like I messed that up when resolving conflicts. I'll fix it
@peterjaap I combined this with PR #3461, please have a look again |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM! @antonmedv merge at will
* origin/master: (23 commits) Magento 2: Only set maintenance mode once if needed (deployphp#3469) Adds Comments to magento2 recipe and modifies DocGen, to be able to explain artifact deployment (deployphp#3510) Added missing deploy task to recipe/common (deployphp#3526) Added support for ntfy.sh notifications, contrib/ntfy (deployphp#3522) Teams, Telegram, Slack contrib recipe no longer fails silently if no webhook is configured (deployphp#3523) [automatic] Update docs with bin/docgen Contrib supervisord monitor (deployphp#3486) Doc update about new default value of writable_recursive (deployphp#3521) Added a note about missing ssh-option. Fixes issue deployphp/deployer… (deployphp#3520) Fix branch deploy for clone strategy Shopware Flex has no `build.sh` anymore (deployphp#3513) Fixed bin/console calls in shopware recipe (deployphp#3512) fix typo in magento recipe (deployphp#3498) Add PUT to Httpie.php (deployphp#3497) Add remote option to update_code_strategy to rename remote to repository (deployphp#3466) Prevent type errors when supplied timeout options are not numeric (deployphp#3484) Magento: allow subdirectory and create variable for bin/magento (deployphp#3460) docs(github-action): improve & update (deployphp#3482) docs(selector): correct env config option to array (deployphp#3481) Fixes deployphp#3472 (deployphp#3473) ...
so it can be overridden to a custom location
Bug fix #…?
New feature?
BC breaks?
Tests added?
Docs added?