Fix tests

Author: figi44

dist/index.js

@@ -6,7 +6,7 @@ import { mkdirP } from "@actions/io";
 import { Octokit } from "@octokit/core";
 import AdmZip from "adm-zip";
 import { filesize } from "filesize";
-import tar from "tar";
+import * as tar from "tar";
 
 import { extendPaths, extendDependencies } from "./env-functions";
 import { isError } from "./helper-functions";

dist/licenses.txt

@@ -4,7 +4,7 @@ import * as core from "@actions/core";
 import { mkdirP } from "@actions/io";
 import { Octokit } from "@octokit/core";
 import { filesize } from "filesize";
-import tar from "tar";
+import * as tar from "tar";
 
 import downloadFile from "./download-file";
 import { extendDependencies } from "./env-functions";

src/download-artifact.ts

@@ -2,7 +2,7 @@ import fs from "fs";
 import path from "path";
 import * as core from "@actions/core";
 import * as artifact from "@actions/artifact";
-import tar from "tar";
+import * as tar from "tar";
 import { filesize } from "filesize";
 
 import { isError } from "./helper-functions";
@@ -131,7 +131,7 @@ const uploadArtifact = async (
         uploadPaths.push(dependenciesPath);
     }
 
-    const artifactClient = artifact.create();
+    const artifactClient = new artifact.DefaultArtifactClient();
 
     let uploadResult;
 
@@ -141,9 +141,6 @@ const uploadArtifact = async (
             artifactName,
             uploadPaths,
             rootDirectory,
-            {
-                continueOnError: true,
-            },
         );
     } catch (error) {
         if (error instanceof Error)
@@ -157,20 +154,9 @@ const uploadArtifact = async (
     if (isError(!uploadResult, `Error uploading artifact for ${packageName}`))
         return false;
 
-    if (
-        isError(
-            uploadResult &&
-                uploadResult.failedItems &&
-                uploadResult.failedItems.length,
-            `Error uploading artifact for ${packageName}: ${uploadResult.failedItems}`,
-        )
-    ) {
-        return false;
-    }
-
     core.info(
-        `==> Uploaded artifact: ${uploadResult.artifactName} (${filesize(
-            uploadResult.size,
+        `==> Uploaded artifact: ${artifactName} (${filesize(
+            uploadResult?.size || 0,
         )})`,
     );
 

src/download-repository.ts

@@ -5,7 +5,7 @@ import * as core from "@actions/core";
 import { Octokit } from "@octokit/core";
 import AdmZip from "adm-zip";
 import { filesize } from "filesize";
-import tar from "tar";
+import * as tar from "tar";
 import { describe, it, expect, vi } from "vitest";
 
 import downloadArtifact from "../src/download-artifact";

src/upload-artifact.ts

@@ -2,7 +2,7 @@ import fs from "fs";
 import * as core from "@actions/core";
 import { Octokit } from "@octokit/core";
 import { filesize } from "filesize";
-import tar from "tar";
+import * as tar from "tar";
 import { describe, it, expect, vi } from "vitest";
 
 import downloadFile from "../src/download-file";

tests/download-artifact.spec.ts

@@ -3,15 +3,19 @@ import path from "path";
 import * as core from "@actions/core";
 import * as artifact from "@actions/artifact";
 import { filesize } from "filesize";
-import tar from "tar";
+import * as tar from "tar";
 import { describe, it, expect, vi } from "vitest";
 
 import uploadArtifact from "../src/upload-artifact";
 import { getCacheKeyHash } from "../src/cache-functions";
 import { EnvironmentVariables } from "../src/types/env-functions";
 
 vi.mock("@actions/core");
-vi.mock("@actions/artifact");
+vi.mock("@actions/artifact", () => ({
+    DefaultArtifactClient: vi.fn().mockImplementation(() => ({
+        uploadArtifact: vi.fn(),
+    })),
+}));
 vi.mock("tar");
 
 const getArtifactName = (
@@ -80,9 +84,7 @@ const emptyObject = {};
 
 const uploadResult = () =>
     Promise.resolve({
-        artifactName,
         size,
-        failedItems: [],
     });
 
 describe("uploadArtifact", () => {
@@ -93,7 +95,7 @@ describe("uploadArtifact", () => {
             ...env,
         };
 
-        (artifact.create as vi.Mock).mockImplementationOnce(() => ({
+        (artifact.DefaultArtifactClient as vi.Mock).mockImplementation(() => ({
             uploadArtifact: uploadResult,
         }));
 
@@ -146,14 +148,21 @@ describe("uploadArtifact", () => {
             ...env,
         };
 
-        const coverageArtifactName = `coverage-${repo}-${os}-${compiler}`;
+        const cacheKeySha = getCacheKeyHash(
+            `coverage-${repo}`,
+            cacheSuffix,
+            env,
+            {},
+            cmakeOptions,
+            sha,
+        );
+
+        const coverageArtifactName = `${os}-${compiler}-coverage-${repo}-${cacheKeySha}`;
 
-        (artifact.create as vi.Mock).mockImplementationOnce(() => ({
+        (artifact.DefaultArtifactClient as vi.Mock).mockImplementation(() => ({
             uploadArtifact: () =>
                 Promise.resolve({
-                    artifactName: coverageArtifactName,
                     size,
-                    failedItems: [],
                 }),
         }));
 
@@ -169,7 +178,7 @@ describe("uploadArtifact", () => {
 
         const isUploaded = await uploadArtifact(
             `coverage-${packageName}`,
-            packageName,
+            `coverage-${packageName}`,
             sha,
             installDir,
             null,
@@ -197,12 +206,10 @@ describe("uploadArtifact", () => {
 
         const ecbuildArtifactName = `ecbuild-${os}-cmake-${testEnv.CMAKE_VERSION}-${sha}`;
 
-        (artifact.create as vi.Mock).mockImplementationOnce(() => ({
+        (artifact.DefaultArtifactClient as vi.Mock).mockImplementation(() => ({
             uploadArtifact: () =>
                 Promise.resolve({
-                    artifactName: ecbuildArtifactName,
                     size,
-                    failedItems: [],
                 }),
         }));
 
@@ -290,7 +297,7 @@ describe("uploadArtifact", () => {
             ...env,
         };
 
-        (artifact.create as vi.Mock).mockImplementation(() => ({
+        (artifact.DefaultArtifactClient as vi.Mock).mockImplementation(() => ({
             uploadArtifact: uploadResult,
         }));
 
@@ -333,9 +340,11 @@ describe("uploadArtifact", () => {
                 ...env,
             };
 
-            (artifact.create as vi.Mock).mockImplementationOnce(() => ({
-                uploadArtifact: uploadResult,
-            }));
+            (artifact.DefaultArtifactClient as vi.Mock).mockImplementation(
+                () => ({
+                    uploadArtifact: uploadResult,
+                }),
+            );
 
             const statSync = vi.spyOn(fs, "statSync");
             (statSync as vi.Mock).mockImplementationOnce(() => ({
@@ -369,7 +378,7 @@ describe("uploadArtifact", () => {
 
             expect(isUploaded).toBe(false);
 
-            (artifact.create as vi.Mock).mockReset();
+            (artifact.DefaultArtifactClient as vi.Mock).mockReset();
 
             if (!(error instanceof Error)) return;
             expect(core.warning).toHaveBeenCalledWith(
@@ -378,61 +387,14 @@ describe("uploadArtifact", () => {
         },
     );
 
-    it("returns false if artifact item upload has some failures", async () => {
-        expect.assertions(2);
-
-        const testEnv = {
-            ...env,
-        };
-
-        (artifact.create as vi.Mock).mockImplementationOnce(() => ({
-            uploadArtifact: () =>
-                Promise.resolve({
-                    artifactName,
-                    size,
-                    failedItems: [artifactName],
-                }),
-        }));
-
-        const statSync = vi.spyOn(fs, "statSync");
-        (statSync as vi.Mock).mockImplementationOnce(() => ({
-            size,
-        }));
-
-        const writeFileSync = vi.spyOn(fs, "writeFileSync");
-        writeFileSync.mockImplementationOnce((path: string) => {
-            if (path === dependenciesPath) return true;
-        });
-
-        const isUploaded = await uploadArtifact(
-            repository,
-            packageName,
-            sha,
-            installDir,
-            dependencies,
-            os,
-            compiler,
-            testEnv,
-            {},
-            githubToken,
-            cacheSuffix,
-            cmakeOptions,
-        );
-
-        expect(isUploaded).toBe(false);
-        expect(core.warning).toHaveBeenCalledWith(
-            `Error uploading artifact for ${repo}: ${artifactName}`,
-        );
-    });
-
     it("returns false if artifact item upload returns empty result", async () => {
         expect.assertions(2);
 
         const testEnv = {
             ...env,
         };
 
-        (artifact.create as vi.Mock).mockImplementationOnce(() => ({
+        (artifact.DefaultArtifactClient as vi.Mock).mockImplementation(() => ({
             uploadArtifact: () => Promise.resolve(),
         }));
 
@@ -480,9 +442,11 @@ describe("uploadArtifact", () => {
                 ...env,
             };
 
-            (artifact.create as vi.Mock).mockImplementationOnce(() => ({
-                uploadArtifact: () => Promise.reject(error),
-            }));
+            (artifact.DefaultArtifactClient as vi.Mock).mockImplementation(
+                () => ({
+                    uploadArtifact: () => Promise.reject(error),
+                }),
+            );
 
             const statSync = vi.spyOn(fs, "statSync");
             (statSync as vi.Mock).mockImplementationOnce(() => ({