jiriks74/create-pull-request
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

create correct tree object for submodule

Browse source
This commit is contained in:
Peter Evans 2024-09-18 15:34:03 +00:00
parent 3cd1f3c5cf
commit 51d5008576
2 changed files with 64 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
dist/index.js vendored
View file

@ -1369,25 +1369,36 @@ class GitHubHelper {
let treeSha = parentCommit.tree; let treeSha = parentCommit.tree;
if (commit.changes.length > 0) { if (commit.changes.length > 0) {
core.info(`Creating tree objects for local commit ${commit.sha}`); core.info(`Creating tree objects for local commit ${commit.sha}`);
const treeObjects = yield Promise.all(commit.changes.map((_a) => __awaiter(this, [_a], void 0, function* ({ path, mode, status }) { const treeObjects = yield Promise.all(commit.changes.map((_a) => __awaiter(this, [_a], void 0, function* ({ path, mode, status, dstSha }) {
if (mode === '160000') {
// submodule
return {
path,
mode,
sha: dstSha,
type: 'commit'
};
}
else {
let sha = null; let sha = null;
if (status === 'A' || status === 'M') { if (status === 'A' || status === 'M') {
try { try {
const { data: blob } = yield blobCreationLimit(() => this.octokit.rest.git.createBlob(Object.assign(Object.assign({}, repository), { content: utils.readFileBase64([repoPath, path]), encoding: 'base64' }))); const { data: blob } = yield blobCreationLimit(() => this.octokit.rest.git.createBlob(Object.assign(Object.assign({}, repository), { content: utils.readFileBase64([repoPath, path]), encoding: 'base64' })));
sha = blob.sha; sha = blob.sha;
core.info(`Created blob for file '${path}'`);
} }
catch (error) { catch (error) {
core.error(`Error creating blob for file '${path}': ${utils.getErrorMessage(error)}`); core.error(`Error creating blob for file '${path}': ${utils.getErrorMessage(error)}`);
throw error; throw error;
} }
} }
core.info(`Created blob for file '${path}'`);
return { return {
path, path,
mode, mode,
sha, sha,
type: 'blob' type: 'blob'
}; };
}
}))); })));
const chunkSize = 100; const chunkSize = 100;
const chunkedTreeObjects = Array.from({ length: Math.ceil(treeObjects.length / chunkSize) }, (_, i) => treeObjects.slice(i * chunkSize, i * chunkSize + chunkSize)); const chunkedTreeObjects = Array.from({ length: Math.ceil(treeObjects.length / chunkSize) }, (_, i) => treeObjects.slice(i * chunkSize, i * chunkSize + chunkSize));

16
src/github-helper.ts
View file

@ -35,7 +35,7 @@ type TreeObject = {
path: string path: string
mode: '100644' | '100755' | '040000' | '160000' | '120000' mode: '100644' | '100755' | '040000' | '160000' | '120000'
sha: string | null sha: string | null
type: 'blob' type: 'blob' | 'commit'
} }
export class GitHubHelper { export class GitHubHelper {
@ -255,7 +255,16 @@ export class GitHubHelper {
if (commit.changes.length > 0) { if (commit.changes.length > 0) {
core.info(`Creating tree objects for local commit ${commit.sha}`) core.info(`Creating tree objects for local commit ${commit.sha}`)
const treeObjects = await Promise.all( const treeObjects = await Promise.all(
commit.changes.map(async ({path, mode, status}) => { commit.changes.map(async ({path, mode, status, dstSha}) => {
if (mode === '160000') {
// submodule
return <TreeObject>{
path,
mode,
sha: dstSha,
type: 'commit'
}
} else {
let sha: string | null = null let sha: string | null = null
if (status === 'A' || status === 'M') { if (status === 'A' || status === 'M') {
try { try {
@ -267,6 +276,7 @@ export class GitHubHelper {
}) })
) )
sha = blob.sha sha = blob.sha
core.info(`Created blob for file '${path}'`)
} catch (error) { } catch (error) {
core.error( core.error(
`Error creating blob for file '${path}': ${utils.getErrorMessage(error)}` `Error creating blob for file '${path}': ${utils.getErrorMessage(error)}`
@ -274,13 +284,13 @@ export class GitHubHelper {
throw error throw error
} }
} }
core.info(`Created blob for file '${path}'`)
return <TreeObject>{ return <TreeObject>{
path, path,
mode, mode,
sha, sha,
type: 'blob' type: 'blob'
} }
}
}) })
) )