Skip to content

Commit dc03e79

Browse files
authored
feat: add upstream version to metapackage composer.json for runtime use (#189)
1 parent 7377a99 commit dc03e79

File tree

3 files changed

+11
-0
lines changed

3 files changed

+11
-0
lines changed

src/determine-dependencies.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,11 @@ module.exports = {
7979

8080
await new Promise(resolve => {
8181
const classesInPhp = childProcess.spawn('php-classes.phar', [], options);
82+
classesInPhp.on('error', error => {
83+
if (error.code === 'ENOENT') {
84+
console.log('Error: Missing `php-classes.phar`. Please see the README for install directions.');
85+
}
86+
});
8287
classesInPhp.on('close', status => resolve());
8388

8489
// Pipe file contents to php-classes.phar separated by a zero byte

src/make/mageos-release.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ Options:
3737
--mageosRelease= Target Mage-OS release version
3838
--releaseRefsFile= JS file exporting a map with the git repo refs to use for the release
3939
--upstreamRelease= Upstream Magento Open Source release to use for package compatibility
40+
--skipHistory Skip rebuilding of historic releases
4041
`);
4142
process.exit(1);
4243
}

src/release-build-tools.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,11 @@ async function buildMageOsProductCommunityEditionMetapackage(releaseVersion, ins
208208
[`${vendor}/product-community-edition`]: [
209209
(composerConfig) => {
210210
updateComposerConfigFromMagentoToMageOs(composerConfig, releaseVersion, replaceVersionMap, vendor)
211+
212+
// Add upstreamRelease to composer extra data for reference
213+
composerConfig.extra = composerConfig.extra || {};
214+
composerConfig.extra.magento_version = replaceVersionMap['replaceVersionMap']['magento/product-community-edition'];
215+
211216
return composerConfig
212217
}
213218
]

0 commit comments

Comments
 (0)