From 56fab3c751adb6d3c6e539b1c9f8dfac10f6635d Mon Sep 17 00:00:00 2001 From: Ryan Hoerr Date: Wed, 8 Oct 2025 22:57:10 -0400 Subject: [PATCH] Fix magento2-base build error for new releases --- src/package-modules.js | 2 ++ src/release-build-tools.js | 3 +++ 2 files changed, 5 insertions(+) diff --git a/src/package-modules.js b/src/package-modules.js index 316bb77..e5be173 100644 --- a/src/package-modules.js +++ b/src/package-modules.js @@ -229,6 +229,8 @@ async function createPackageForRef(instruction, package, release) { if (!excludes.includes('composer.json')) excludes.push('composer.json'); if (!excludes.includes('.git/')) excludes.push('.git/'); + package.composerJsonFile ??= package.composerJsonPath; + let magentoName = lastTwoDirs(package.dir) || ''; const composerJson = await getComposerJson(instruction, package, release.ref); diff --git a/src/release-build-tools.js b/src/release-build-tools.js index 0b2c2a7..123f10f 100644 --- a/src/release-build-tools.js +++ b/src/release-build-tools.js @@ -224,6 +224,9 @@ function updateComposerConfigFromMagentoToMageOs(instruction, release, composerC async function prepPackageForRelease(instruction, package, release, workingCopyPath) { console.log(`Preparing ${package.label}`); + // Reset value in case it was set during history mirroring + package.composerJsonFile = null; + const composerConfig = JSON.parse(await readComposerJson(instruction.repoUrl, package.dir, release.ref)); updateComposerConfigFromMagentoToMageOs(instruction, release, composerConfig);