Skip to content

Commit 6263cfb

Browse files
committed
Scrubbed workaround introduced in #72 to resolve issue affecting 2.1.3 and through 2.2.2 or possible up to but not including 2.3.0
Indicator of being fixed in 2.2.2 and later: magento/magento2#10673 (comment) Indicator of it being fixed in 2.3.0 and later: magento/magento2#10913 Related to magento/magento2#7862 which is now closed as resolved in 2.2.x somewhere
1 parent 3ca4d98 commit 6263cfb

File tree

1 file changed

+2
-12
lines changed

1 file changed

+2
-12
lines changed

lib/capistrano/tasks/magento.rake

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,7 @@ namespace :magento do
339339
with mage_mode: :production do
340340
_magento_version = magento_version
341341

342+
deploy_languages = fetch(:magento_deploy_languages).join(' ')
342343
deploy_themes = fetch(:magento_deploy_themes)
343344
deploy_jobs = fetch(:magento_deploy_jobs)
344345

@@ -354,14 +355,6 @@ namespace :magento do
354355
deploy_jobs = nil
355356
end
356357

357-
# Workaround core-bug with multi-lingual deployments on Magento 2.1.3 and greater. In these versions each
358-
# language must be iterated individually. See issue #72 for details.
359-
if _magento_version >= Gem::Version.new('2.1.3')
360-
deploy_languages = fetch(:magento_deploy_languages)
361-
else
362-
deploy_languages = [fetch(:magento_deploy_languages).join(' ')]
363-
end
364-
365358
# Magento 2.2 introduced static content compilation strategies that can be one of the following:
366359
# quick (default), standard (like previous versions) or compact
367360
compilation_strategy = fetch(:magento_deploy_strategy)
@@ -375,10 +368,7 @@ namespace :magento do
375368
# Magento 2.1 will fail to deploy if this file does not exist and static asset signing is enabled
376369
execute :touch, "#{release_path}/pub/static/deployed_version.txt"
377370

378-
# This loop exists to support deploy on versions where each language must be deployed seperately
379-
deploy_languages.each do |lang|
380-
static_content_deploy "#{compilation_strategy}#{deploy_jobs}#{lang}#{deploy_themes}"
381-
end
371+
static_content_deploy "#{compilation_strategy}#{deploy_jobs}#{deploy_languages}#{deploy_themes}"
382372
end
383373

384374
# Set the deployed_version of static content to ensure it matches across all hosts

0 commit comments

Comments
 (0)