Simplify artifacts

Author: matejchalk

src/artifact.ts

@@ -6,33 +6,14 @@ import {
 import * as core from '@actions/core'
 import * as github from '@actions/github'
 import type { GitBranch } from '@code-pushup/ci'
-import { DEFAULT_PERSIST_FILENAME } from '@code-pushup/models'
-import { projectToFilename } from '@code-pushup/utils'
 import type { RequestError } from '@octokit/request-error'
 import { readdir, rm } from 'node:fs/promises'
-import { join } from 'node:path'
+import path from 'node:path'
 import type { ActionInputs } from './inputs'
 
-const REPORT_ARTIFACT_NAME = 'code-pushup-report'
-const DIFF_ARTIFACT_NAME = 'code-pushup-report-diff'
+export const REPORT_ARTIFACT_NAME = 'code-pushup-report'
 const ARTIFACT_DIR = 'tmp'
 
-export function createReportArtifactName(project?: string): string {
-  return createArtifactName(REPORT_ARTIFACT_NAME, project)
-}
-
-export function createDiffArtifactName(project?: string): string {
-  return createArtifactName(DIFF_ARTIFACT_NAME, project)
-}
-
-function createArtifactName(base: string, project: string | undefined): string {
-  if (!project) {
-    return base
-  }
-  const suffix = projectToFilename(project)
-  return `${base}-${suffix}`
-}
-
 export async function uploadArtifact(
   artifact: ArtifactClient,
   name: string,
@@ -96,7 +77,7 @@ export async function downloadReportArtifact(
     }
 
     const { artifact: reportArtifact } = await artifact.getArtifact(
-      createReportArtifactName(project),
+      REPORT_ARTIFACT_NAME,
       { findBy }
     )
     core.debug(
@@ -111,18 +92,25 @@ export async function downloadReportArtifact(
     if (!downloadPath) {
       throw new Error('Unexpected empty downloadPath')
     }
-    const files = await readdir(downloadPath)
+    const files = await readdir(downloadPath, { recursive: true })
     core.debug(
       `Downloaded artifact to ${downloadPath}, contains files: ${files.join(', ')}`
     )
 
-    const reportJsonFile = `${DEFAULT_PERSIST_FILENAME}.json`
-    if (!files.includes(reportJsonFile)) {
-      core.warning(`Downloaded artifact doesn't contain ${reportJsonFile}`)
+    const expectedFile = path.join(
+      '.code-pushup',
+      '.ci',
+      project ?? '',
+      '.current',
+      'report.json'
+    )
+
+    if (!files.includes(expectedFile)) {
+      core.warning(`Downloaded artifact doesn't contain ${expectedFile}`)
       return null
     }
 
-    return join(downloadPath, reportJsonFile)
+    return path.join(downloadPath, expectedFile)
   } catch (err) {
     if (err instanceof ArtifactNotFoundError) {
       core.info(

src/main.ts

@@ -5,11 +5,7 @@ import { runInCI } from '@code-pushup/ci'
 import { simpleGit } from 'simple-git'
 import { createAnnotationsFromIssues } from './annotations'
 import { GitHubApiClient } from './api'
-import {
-  createDiffArtifactName,
-  createReportArtifactName,
-  uploadArtifact
-} from './artifact'
+import { REPORT_ARTIFACT_NAME, uploadArtifact } from './artifact'
 import { parseInputs } from './inputs'
 import { createOptions } from './options'
 import { parseGitRefs } from './refs'
@@ -57,42 +53,30 @@ export async function run(
     core.info(`Commented on PR #${github.context.issue.number}`)
   }
 
-  const diffFiles =
+  const artifactFiles =
     result.mode === 'standalone'
-      ? Object.values(result.files.diff ?? {})
-      : result.diffPath
-        ? [result.diffPath]
-        : []
+      ? [
+          ...Object.values(result.files.current),
+          ...Object.values(result.files.previous ?? {}),
+          ...Object.values(result.files.comparison ?? {})
+        ]
+      : [
+          ...Object.values(result.files?.comparison ?? {}),
+          ...result.projects.flatMap(({ files }) => [
+            ...Object.values(files.current),
+            ...Object.values(files.previous ?? {}),
+            ...Object.values(files.comparison ?? {})
+          ])
+        ]
 
-  if (diffFiles.length > 0) {
-    await uploadArtifact(artifact, createDiffArtifactName(), diffFiles, inputs)
-  }
-
-  if (result.mode === 'standalone') {
+  if (artifactFiles.length > 0) {
     const id = await uploadArtifact(
       artifact,
-      createReportArtifactName(),
-      Object.values(result.files.report),
+      REPORT_ARTIFACT_NAME,
+      artifactFiles,
       inputs
     )
     core.setOutput('artifact-id', id)
-  } else {
-    for (const project of result.projects) {
-      await uploadArtifact(
-        artifact,
-        createReportArtifactName(project.name),
-        Object.values(project.files.report),
-        inputs
-      )
-      if (project.files.diff) {
-        await uploadArtifact(
-          artifact,
-          createDiffArtifactName(project.name),
-          Object.values(project.files.diff),
-          inputs
-        )
-      }
-    }
   }
 
   if (inputs.annotations) {