From f913b0fc8b962f64526ca37bccb516451db2a97f Mon Sep 17 00:00:00 2001 From: didinele Date: Mon, 6 Oct 2025 12:37:05 +0300 Subject: [PATCH 1/5] ci(release): handling for create-discord-app --- .github/workflows/release.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index acd1defcd754..6f17e98a9585 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -109,3 +109,11 @@ jobs: env: NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }} GITHUB_TOKEN: ${{ steps.app-token.outputs.token }} + + - name: create-discord-bot -> create-discord-app + if: ${{ inputs.package == 'all' || inputs.package == 'create-discord-bot' }} + run: | + pnpm --filter=create-discord-bot run rename-to-app + pnpm --filter=create-discord-app publish --provenance --no-git-check + env: + NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }} From 89b5405282adb304bd9e990576ee614d9c033250 Mon Sep 17 00:00:00 2001 From: didinele Date: Mon, 6 Oct 2025 12:43:29 +0300 Subject: [PATCH 2/5] ci(deprecate): cda support --- .github/workflows/deprecate-version.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deprecate-version.yml b/.github/workflows/deprecate-version.yml index 7ae3340f356a..c7cdf14d013d 100644 --- a/.github/workflows/deprecate-version.yml +++ b/.github/workflows/deprecate-version.yml @@ -11,6 +11,7 @@ on: - '@discordjs/builders' - '@discordjs/collection' - '@discordjs/core' + - 'create-discord-app' - 'create-discord-bot' - '@discordjs/formatters' - 'discord.js' From d0459398f2be8fc24e62d48279e3326a9d838b9e Mon Sep 17 00:00:00 2001 From: didinele Date: Tue, 7 Oct 2025 10:46:57 +0300 Subject: [PATCH 3/5] ci: update our custom action to handle the renaming when invoked --- .github/workflows/release.yml | 8 -------- packages/actions/src/releasePackages/releasePackage.ts | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6f17e98a9585..acd1defcd754 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -109,11 +109,3 @@ jobs: env: NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }} GITHUB_TOKEN: ${{ steps.app-token.outputs.token }} - - - name: create-discord-bot -> create-discord-app - if: ${{ inputs.package == 'all' || inputs.package == 'create-discord-bot' }} - run: | - pnpm --filter=create-discord-bot run rename-to-app - pnpm --filter=create-discord-app publish --provenance --no-git-check - env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }} diff --git a/packages/actions/src/releasePackages/releasePackage.ts b/packages/actions/src/releasePackages/releasePackage.ts index 7892264fe59d..06a1d330dad8 100644 --- a/packages/actions/src/releasePackages/releasePackage.ts +++ b/packages/actions/src/releasePackages/releasePackage.ts @@ -83,4 +83,12 @@ export async function releasePackage(release: ReleaseEntry, dev: boolean, dry: b // eslint-disable-next-line promise/prefer-await-to-then .then(() => {}); } + + // Evil, but I can't think of a cleaner mechanism + if (release.name === 'create-discord-bot') { + await $`pnpm --filter=create-discord-bot run rename-to-app`; + // eslint-disable-next-line require-atomic-updates + release.name = 'create-discord-app'; + await releasePackage(release, dev, dry); + } } From c15ba0ba338ade7e6578cd3464709fdb5d8b9372 Mon Sep 17 00:00:00 2001 From: didinele Date: Wed, 8 Oct 2025 13:20:19 +0300 Subject: [PATCH 4/5] fix: don't double release on github --- packages/actions/src/releasePackages/releasePackage.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/actions/src/releasePackages/releasePackage.ts b/packages/actions/src/releasePackages/releasePackage.ts index 06a1d330dad8..3729e3eb0259 100644 --- a/packages/actions/src/releasePackages/releasePackage.ts +++ b/packages/actions/src/releasePackages/releasePackage.ts @@ -41,7 +41,7 @@ async function gitTagAndRelease(release: ReleaseEntry, dry: boolean) { } } -export async function releasePackage(release: ReleaseEntry, dev: boolean, dry: boolean) { +export async function releasePackage(release: ReleaseEntry, dev: boolean, dry: boolean, doGitRelease = !dev) { // Sanity check against the registry first if (await checkRegistry(release)) { info(`${release.name}@${release.version} already published, skipping.`); @@ -54,7 +54,7 @@ export async function releasePackage(release: ReleaseEntry, dev: boolean, dry: b await $`pnpm --filter=${release.name} publish --provenance --no-git-checks ${dev ? '--tag=dev' : ''}`; } - if (!dev) await gitTagAndRelease(release, dry); + if (doGitRelease) await gitTagAndRelease(release, dry); if (dry) return; @@ -89,6 +89,6 @@ export async function releasePackage(release: ReleaseEntry, dev: boolean, dry: b await $`pnpm --filter=create-discord-bot run rename-to-app`; // eslint-disable-next-line require-atomic-updates release.name = 'create-discord-app'; - await releasePackage(release, dev, dry); + await releasePackage(release, dev, dry, false); } } From eed6f20d3ab8456106c5ca9f70fcf41459f2e06a Mon Sep 17 00:00:00 2001 From: didinele Date: Wed, 8 Oct 2025 13:26:55 +0300 Subject: [PATCH 5/5] chore: just in case --- packages/actions/src/releasePackages/releasePackage.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/actions/src/releasePackages/releasePackage.ts b/packages/actions/src/releasePackages/releasePackage.ts index 3729e3eb0259..6b911136bf22 100644 --- a/packages/actions/src/releasePackages/releasePackage.ts +++ b/packages/actions/src/releasePackages/releasePackage.ts @@ -54,7 +54,8 @@ export async function releasePackage(release: ReleaseEntry, dev: boolean, dry: b await $`pnpm --filter=${release.name} publish --provenance --no-git-checks ${dev ? '--tag=dev' : ''}`; } - if (doGitRelease) await gitTagAndRelease(release, dry); + // && !dev just to be sure + if (doGitRelease && !dev) await gitTagAndRelease(release, dry); if (dry) return;