From 013d19c3d8a6f258b8f447224650f05a332a501a Mon Sep 17 00:00:00 2001 From: Eunjae Lee Date: Tue, 29 Mar 2022 11:52:36 +0200 Subject: [PATCH 1/3] chore(ci): fix regression regarding emptyDir --- scripts/release/process-release.ts | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/scripts/release/process-release.ts b/scripts/release/process-release.ts index 5c4b09d44b9..f615a40b3ab 100755 --- a/scripts/release/process-release.ts +++ b/scripts/release/process-release.ts @@ -3,7 +3,7 @@ import fsp from 'fs/promises'; import dotenv from 'dotenv'; import execa from 'execa'; -import { emptyDir, copy } from 'fs-extra'; +import { copy, remove } from 'fs-extra'; import semver from 'semver'; import type { ReleaseType } from 'semver'; @@ -28,6 +28,7 @@ import { } from './common'; import TEXT from './text'; import type { VersionsToRelease } from './types'; +import path from 'path'; dotenv.config({ path: ROOT_ENV_PATH }); @@ -110,6 +111,14 @@ async function updateOpenApiTools( ); } +async function emptyDirExceptForDotGit(dir: string): Promise { + for await (const file of await fsp.readdir(dir)) { + if (file !== '.git') { + await remove(path.resolve(dir, file)); + } + } +} + async function updateChangelog({ lang, issueBody, @@ -206,7 +215,7 @@ async function processRelease(): Promise { }); const clientPath = toAbsolutePath(getLanguageFolder(lang)); - await emptyDir(tempGitDir); + await emptyDirExceptForDotGit(tempGitDir); await copy(clientPath, tempGitDir, { preserveTimestamps: true }); await configureGitHubAuthor(tempGitDir); From 09d10eb3ac4ca940b1f94240966bf93197d82ba0 Mon Sep 17 00:00:00 2001 From: Eunjae Lee Date: Tue, 29 Mar 2022 11:58:30 +0200 Subject: [PATCH 2/3] chore: fix import order problem --- scripts/release/process-release.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/release/process-release.ts b/scripts/release/process-release.ts index f615a40b3ab..b0e40d1f58f 100755 --- a/scripts/release/process-release.ts +++ b/scripts/release/process-release.ts @@ -1,5 +1,6 @@ /* eslint-disable no-console */ import fsp from 'fs/promises'; +import path from 'path'; import dotenv from 'dotenv'; import execa from 'execa'; @@ -28,7 +29,6 @@ import { } from './common'; import TEXT from './text'; import type { VersionsToRelease } from './types'; -import path from 'path'; dotenv.config({ path: ROOT_ENV_PATH }); From ce70078e373b0a982b73836d3c17b85d2f3ba915 Mon Sep 17 00:00:00 2001 From: Eunjae Lee Date: Tue, 29 Mar 2022 14:09:17 +0200 Subject: [PATCH 3/3] Update scripts/release/process-release.ts Co-authored-by: Pierre Millot --- scripts/release/process-release.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/release/process-release.ts b/scripts/release/process-release.ts index b0e40d1f58f..0bdda869221 100755 --- a/scripts/release/process-release.ts +++ b/scripts/release/process-release.ts @@ -112,7 +112,7 @@ async function updateOpenApiTools( } async function emptyDirExceptForDotGit(dir: string): Promise { - for await (const file of await fsp.readdir(dir)) { + for (const file of await fsp.readdir(dir)) { if (file !== '.git') { await remove(path.resolve(dir, file)); }