Skip to content

Commit ad400b0

Browse files
author
Karpenko, Oleksandr
committed
MAGETWO-56915: Versioning of static files (CSS, JS, Fonts, Images, etc.) doesn't enabled by default - for mainline
1 parent eae5c45 commit ad400b0

File tree

1 file changed

+30
-26
lines changed

1 file changed

+30
-26
lines changed

app/code/Magento/Deploy/Model/Deployer.php

Lines changed: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,9 @@ public function deploy(ObjectManagerFactory $omFactory, array $locales, array $d
216216
$appFiles = $this->filesUtil->getStaticPreProcessingFiles();
217217

218218
$version = (new \DateTime())->getTimestamp();
219-
$this->versionStorage->save($version);
219+
if (!$this->getOption(Options::DRY_RUN)) {
220+
$this->versionStorage->save($version);
221+
}
220222

221223
foreach ($deployableAreaThemeMap as $area => $themes) {
222224
$this->emulateApplicationArea($area);
@@ -228,31 +230,33 @@ public function deploy(ObjectManagerFactory $omFactory, array $locales, array $d
228230
$this->count = 0;
229231
$this->errorCount = 0;
230232

231-
/** @var \Magento\Theme\Model\View\Design $design */
232-
$design = $this->objectManager->create(\Magento\Theme\Model\View\Design::class);
233-
$design->setDesignTheme($themePath, $area);
234-
235-
$assetRepo = $this->objectManager->create(
236-
\Magento\Framework\View\Asset\Repository::class,
237-
[
238-
'design' => $design,
239-
]
240-
);
241-
/** @var \Magento\RequireJs\Model\FileManager $fileManager */
242-
$fileManager = $this->objectManager->create(
243-
\Magento\RequireJs\Model\FileManager::class,
244-
[
245-
'config' => $this->objectManager->create(
246-
\Magento\Framework\RequireJs\Config::class,
247-
[
248-
'assetRepo' => $assetRepo,
249-
'design' => $design,
250-
]
251-
),
252-
'assetRepo' => $assetRepo,
253-
]
254-
);
255-
$fileManager->createRequireJsConfigAsset();
233+
if (!$this->getOption(Options::DRY_RUN)) {
234+
/** @var \Magento\Theme\Model\View\Design $design */
235+
$design = $this->objectManager->create(\Magento\Theme\Model\View\Design::class);
236+
$design->setDesignTheme($themePath, $area);
237+
238+
$assetRepo = $this->objectManager->create(
239+
\Magento\Framework\View\Asset\Repository::class,
240+
[
241+
'design' => $design,
242+
]
243+
);
244+
/** @var \Magento\RequireJs\Model\FileManager $fileManager */
245+
$fileManager = $this->objectManager->create(
246+
\Magento\RequireJs\Model\FileManager::class,
247+
[
248+
'config' => $this->objectManager->create(
249+
\Magento\Framework\RequireJs\Config::class,
250+
[
251+
'assetRepo' => $assetRepo,
252+
'design' => $design,
253+
]
254+
),
255+
'assetRepo' => $assetRepo,
256+
]
257+
);
258+
$fileManager->createRequireJsConfigAsset();
259+
}
256260

257261
foreach ($appFiles as $info) {
258262
list($fileArea, $fileTheme, , $module, $filePath, $fullPath) = $info;

0 commit comments

Comments
 (0)