Skip to content

Commit 56fab3c

Browse files
committed
Fix magento2-base build error for new releases
1 parent 6caef99 commit 56fab3c

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

src/package-modules.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,8 @@ async function createPackageForRef(instruction, package, release) {
229229
if (!excludes.includes('composer.json')) excludes.push('composer.json');
230230
if (!excludes.includes('.git/')) excludes.push('.git/');
231231

232+
package.composerJsonFile ??= package.composerJsonPath;
233+
232234
let magentoName = lastTwoDirs(package.dir) || '';
233235
const composerJson = await getComposerJson(instruction, package, release.ref);
234236

src/release-build-tools.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,9 @@ function updateComposerConfigFromMagentoToMageOs(instruction, release, composerC
224224
async function prepPackageForRelease(instruction, package, release, workingCopyPath) {
225225
console.log(`Preparing ${package.label}`);
226226

227+
// Reset value in case it was set during history mirroring
228+
package.composerJsonFile = null;
229+
227230
const composerConfig = JSON.parse(await readComposerJson(instruction.repoUrl, package.dir, release.ref));
228231
updateComposerConfigFromMagentoToMageOs(instruction, release, composerConfig);
229232

0 commit comments

Comments
 (0)