From 126578d6dfd000f5d1f777862164c00f901276b6 Mon Sep 17 00:00:00 2001 From: shortcuts Date: Wed, 12 Feb 2025 17:09:14 +0100 Subject: [PATCH 1/3] chore(scripts): set repository for gh commands --- scripts/ci/codegen/pushToRepository.ts | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/scripts/ci/codegen/pushToRepository.ts b/scripts/ci/codegen/pushToRepository.ts index d4c9d26b3fc..dd6497bb9bd 100644 --- a/scripts/ci/codegen/pushToRepository.ts +++ b/scripts/ci/codegen/pushToRepository.ts @@ -20,7 +20,6 @@ import { pushToRepositoryConfiguration } from './types.ts'; import { getClientsConfigField } from '../../config.ts'; import { commitStartRelease } from './text.ts'; -import { sleep } from './waitForAllReleases.ts'; async function handleSpecFiles(spec: SpecsToPush, tempGitDir: string): Promise { const pathToSpecs = toAbsolutePath(`${tempGitDir}/${spec.output}`); @@ -159,10 +158,7 @@ async function pushToRepository(repository: string, config: RepositoryConfigurat head: task.prBranch, }); - // the graphql api of gh might have some cache so we need to wait a bit - await sleep(10_000); - - await run(`gh pr merge ${data.number} --auto`); + await run(`gh repo set-default ${OWNER}/${repository} && gh pr merge ${data.number} --auto`); console.log(`Pull request created on ${OWNER}/${repository}`); console.log(` > ${data.url}`); From 2a24c73f6ef98a3e9ceb406f3d875f053d7b635d Mon Sep 17 00:00:00 2001 From: shortcuts Date: Wed, 12 Feb 2025 17:11:49 +0100 Subject: [PATCH 2/3] chore: login --- scripts/ci/codegen/pushToRepository.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/ci/codegen/pushToRepository.ts b/scripts/ci/codegen/pushToRepository.ts index dd6497bb9bd..c7bce5a1e0e 100644 --- a/scripts/ci/codegen/pushToRepository.ts +++ b/scripts/ci/codegen/pushToRepository.ts @@ -158,7 +158,9 @@ async function pushToRepository(repository: string, config: RepositoryConfigurat head: task.prBranch, }); - await run(`gh repo set-default ${OWNER}/${repository} && gh pr merge ${data.number} --auto`); + await run(`gh auth login --with-token ${ensureGitHubToken()}`); + await run(`gh repo set-default ${OWNER}/${repository}`); + await run(`gh pr merge ${data.number} --auto`); console.log(`Pull request created on ${OWNER}/${repository}`); console.log(` > ${data.url}`); From cc9d922b4d1b23dea65a5b0922f463cfce251225 Mon Sep 17 00:00:00 2001 From: shortcuts Date: Wed, 12 Feb 2025 17:16:20 +0100 Subject: [PATCH 3/3] chore: pie2re --- scripts/ci/codegen/pushToRepository.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/ci/codegen/pushToRepository.ts b/scripts/ci/codegen/pushToRepository.ts index c7bce5a1e0e..e7b10e8ba7e 100644 --- a/scripts/ci/codegen/pushToRepository.ts +++ b/scripts/ci/codegen/pushToRepository.ts @@ -159,8 +159,7 @@ async function pushToRepository(repository: string, config: RepositoryConfigurat }); await run(`gh auth login --with-token ${ensureGitHubToken()}`); - await run(`gh repo set-default ${OWNER}/${repository}`); - await run(`gh pr merge ${data.number} --auto`); + await run(`gh --repo ${OWNER}/${repository} pr merge ${data.number} --auto`); console.log(`Pull request created on ${OWNER}/${repository}`); console.log(` > ${data.url}`);