Merge branch 'master' into dependabot/npm_and_yarn/ts-pattern-5.5.0

scala-steward-org · Nov 4, 2024 · f050a2a · f050a2a
2 parents 8d2631f + 7aeabbe
commit f050a2a
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 20 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -48,7 +48,7 @@
     "@ava/typescript": "^5.0.0",
     "@tsconfig/node20": "^20.1.4",
     "@types/js-yaml": "^4.0.9",
-    "@types/node": "^22.7.4",
+    "@types/node": "^22.8.6",
     "@vercel/ncc": "^0.38.2",
     "all-contributors-cli": "^6.26.1",
     "ava": "^6.2.0",

diff --git a/src/action/main.ts b/src/action/main.ts
@@ -76,16 +76,16 @@ async function run(): Promise<void> {
         '--disable-sandbox',
         inputs.steward.extraArgs?.value.split(' ') ?? [],
       ], inputs.steward.extraJars)
-    } finally {
-      await workspace.saveWorkspaceCache()
-      await workspace.cancelTokenRefresh()
-    }
 
-    if (files.existsSync(workspace.runSummary_md)) {
-      logger.info(`✓ Run Summary file: ${workspace.runSummary_md}`)
+      if (files.existsSync(workspace.runSummary_md)) {
+        logger.info(`✓ Run Summary file: ${workspace.runSummary_md}`)
 
-      const summaryMarkdown = files.readFileSync(workspace.runSummary_md, 'utf8')
-      await core.summary.addRaw(summaryMarkdown).write()
+        const summaryMarkdown = files.readFileSync(workspace.runSummary_md, 'utf8')
+        await core.summary.addRaw(summaryMarkdown).write()
+      }
+    } finally {
+      await workspace.purgeTempFilesAndSaveCache()
+      await workspace.cancelTokenRefresh()
     }
   } catch (error: unknown) {
     core.setFailed(` ✕ ${(error as Error).message}`)

diff --git a/src/modules/workspace.test.ts b/src/modules/workspace.test.ts
@@ -187,7 +187,7 @@ test('`Workspace.restoreWorkspaceCache()` → generates different hash for diffe
 test('`Workspace.saveWorkspaceCache()` → saves cache', async t => {
   const {workspace, calls} = fixture('- owner/repo')
 
-  await workspace.saveWorkspaceCache()
+  await workspace.purgeTempFilesAndSaveCache()
 
   const now = Date.now()
 

diff --git a/src/modules/workspace.ts b/src/modules/workspace.ts
@@ -74,7 +74,7 @@ export class Workspace {
    *
    * @param {string} workspace - the Scala Steward workspace directory
    */
-  async saveWorkspaceCache(): Promise<void> {
+  async purgeTempFilesAndSaveCache(): Promise<void> {
     try {
       this.logger.startGroup('Saving workspace to cache...')