Skip to content

Commit

Permalink
Merge pull request #23046 from storybookjs/kasper/use-full-oid
Browse files Browse the repository at this point in the history
Release tooling: Give the full commit hash to the github API
  • Loading branch information
kasperpeulen committed Jun 13, 2023
1 parent ff75e20 commit 1ca9621
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions scripts/release/utils/get-github-info.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ function makeQuery(repos: ReposWithCommitsAndPRsToFetch) {
}
mergeCommit {
commitUrl
abbreviatedOid
oid
}
}`
)
Expand Down Expand Up @@ -285,11 +285,11 @@ export async function getPullInfoFromPullRequest(request: {
user: user ? user.login : null,
id: null,
pull: request.pull,
commit: commit ? commit.abbreviatedOid : null,
commit: commit ? commit.oid : null,
title: title || null,
labels: data ? (data.labels.nodes || []).map((label: { name: string }) => label.name) : null,
links: {
commit: commit ? `[\`${commit.abbreviatedOid}\`](${commit.commitUrl})` : null,
commit: commit ? `[\`${commit.oid}\`](${commit.commitUrl})` : null,
pull: `[#${request.pull}](https://github.com/${request.repo}/pull/${request.pull})`,
user: user ? `[@${user.login}](${user.url})` : null,
},
Expand Down
4 changes: 2 additions & 2 deletions scripts/release/utils/get-unpicked-prs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export async function getUnpickedPRs(baseBranch: string, verbose?: boolean): Pro
title
baseRefName
mergeCommit {
abbreviatedOid
oid
}
labels(first: 20) {
nodes {
Expand Down Expand Up @@ -55,7 +55,7 @@ export async function getUnpickedPRs(baseBranch: string, verbose?: boolean): Pro
id: node.id,
branch: node.baseRefName,
title: node.title,
mergeCommit: node.mergeCommit.abbreviatedOid,
mergeCommit: node.mergeCommit.oid,
labels: node.labels.nodes.map((l: any) => l.name),
}));

Expand Down

0 comments on commit 1ca9621

Please sign in to comment.