mirror of
https://code.forgejo.org/actions/cache.git
synced 2025-04-20 15:53:59 +08:00
Use zstd instead of gzip if available
Add zstd to cache versioning
This commit is contained in:
parent
9ceee97d99
commit
97f7baa910
14 changed files with 523 additions and 201 deletions
|
@ -2,7 +2,12 @@ import * as core from "@actions/core";
|
|||
import * as path from "path";
|
||||
|
||||
import * as cacheHttpClient from "../src/cacheHttpClient";
|
||||
import { CacheFilename, Events, Inputs } from "../src/constants";
|
||||
import {
|
||||
CacheFilename,
|
||||
CompressionMethod,
|
||||
Events,
|
||||
Inputs
|
||||
} from "../src/constants";
|
||||
import { ArtifactCacheEntry } from "../src/contracts";
|
||||
import run from "../src/save";
|
||||
import * as tar from "../src/tar";
|
||||
|
@ -50,6 +55,11 @@ beforeAll(() => {
|
|||
jest.spyOn(actionUtils, "createTempDirectory").mockImplementation(() => {
|
||||
return Promise.resolve("/foo/bar");
|
||||
});
|
||||
|
||||
jest.spyOn(actionUtils, "getCacheFileName").mockImplementation(cm => {
|
||||
const actualUtils = jest.requireActual("../src/utils/actionUtils");
|
||||
return actualUtils.getCacheFileName(cm);
|
||||
});
|
||||
});
|
||||
|
||||
beforeEach(() => {
|
||||
|
@ -201,20 +211,27 @@ test("save with large cache outputs warning", async () => {
|
|||
jest.spyOn(actionUtils, "getArchiveFileSize").mockImplementationOnce(() => {
|
||||
return cacheSize;
|
||||
});
|
||||
const compression = CompressionMethod.Gzip;
|
||||
const getCompressionMock = jest
|
||||
.spyOn(actionUtils, "getCompressionMethod")
|
||||
.mockReturnValue(Promise.resolve(compression));
|
||||
|
||||
await run();
|
||||
|
||||
const archiveFolder = "/foo/bar";
|
||||
|
||||
expect(createTarMock).toHaveBeenCalledTimes(1);
|
||||
expect(createTarMock).toHaveBeenCalledWith(archiveFolder, cachePaths);
|
||||
|
||||
expect(createTarMock).toHaveBeenCalledWith(
|
||||
archiveFolder,
|
||||
cachePaths,
|
||||
compression
|
||||
);
|
||||
expect(logWarningMock).toHaveBeenCalledTimes(1);
|
||||
expect(logWarningMock).toHaveBeenCalledWith(
|
||||
"Cache size of ~6144 MB (6442450944 B) is over the 5GB limit, not saving cache."
|
||||
);
|
||||
|
||||
expect(failedMock).toHaveBeenCalledTimes(0);
|
||||
expect(getCompressionMock).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
test("save with reserve cache failure outputs warning", async () => {
|
||||
|
@ -250,13 +267,18 @@ test("save with reserve cache failure outputs warning", async () => {
|
|||
});
|
||||
|
||||
const createTarMock = jest.spyOn(tar, "createTar");
|
||||
|
||||
const saveCacheMock = jest.spyOn(cacheHttpClient, "saveCache");
|
||||
const compression = CompressionMethod.Zstd;
|
||||
const getCompressionMock = jest
|
||||
.spyOn(actionUtils, "getCompressionMethod")
|
||||
.mockReturnValue(Promise.resolve(compression));
|
||||
|
||||
await run();
|
||||
|
||||
expect(reserveCacheMock).toHaveBeenCalledTimes(1);
|
||||
expect(reserveCacheMock).toHaveBeenCalledWith(primaryKey);
|
||||
expect(reserveCacheMock).toHaveBeenCalledWith(primaryKey, {
|
||||
compressionMethod: compression
|
||||
});
|
||||
|
||||
expect(infoMock).toHaveBeenCalledWith(
|
||||
`Unable to reserve cache with key ${primaryKey}, another job may be creating this cache.`
|
||||
|
@ -266,6 +288,7 @@ test("save with reserve cache failure outputs warning", async () => {
|
|||
expect(saveCacheMock).toHaveBeenCalledTimes(0);
|
||||
expect(logWarningMock).toHaveBeenCalledTimes(0);
|
||||
expect(failedMock).toHaveBeenCalledTimes(0);
|
||||
expect(getCompressionMock).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
test("save with server error outputs warning", async () => {
|
||||
|
@ -308,17 +331,27 @@ test("save with server error outputs warning", async () => {
|
|||
.mockImplementationOnce(() => {
|
||||
throw new Error("HTTP Error Occurred");
|
||||
});
|
||||
const compression = CompressionMethod.Zstd;
|
||||
const getCompressionMock = jest
|
||||
.spyOn(actionUtils, "getCompressionMethod")
|
||||
.mockReturnValue(Promise.resolve(compression));
|
||||
|
||||
await run();
|
||||
|
||||
expect(reserveCacheMock).toHaveBeenCalledTimes(1);
|
||||
expect(reserveCacheMock).toHaveBeenCalledWith(primaryKey);
|
||||
expect(reserveCacheMock).toHaveBeenCalledWith(primaryKey, {
|
||||
compressionMethod: compression
|
||||
});
|
||||
|
||||
const archiveFolder = "/foo/bar";
|
||||
const archiveFile = path.join(archiveFolder, CacheFilename);
|
||||
const archiveFile = path.join(archiveFolder, CacheFilename.Zstd);
|
||||
|
||||
expect(createTarMock).toHaveBeenCalledTimes(1);
|
||||
expect(createTarMock).toHaveBeenCalledWith(archiveFolder, cachePaths);
|
||||
expect(createTarMock).toHaveBeenCalledWith(
|
||||
archiveFolder,
|
||||
cachePaths,
|
||||
compression
|
||||
);
|
||||
|
||||
expect(saveCacheMock).toHaveBeenCalledTimes(1);
|
||||
expect(saveCacheMock).toHaveBeenCalledWith(cacheId, archiveFile);
|
||||
|
@ -327,6 +360,7 @@ test("save with server error outputs warning", async () => {
|
|||
expect(logWarningMock).toHaveBeenCalledWith("HTTP Error Occurred");
|
||||
|
||||
expect(failedMock).toHaveBeenCalledTimes(0);
|
||||
expect(getCompressionMock).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
test("save with valid inputs uploads a cache", async () => {
|
||||
|
@ -364,20 +398,31 @@ test("save with valid inputs uploads a cache", async () => {
|
|||
const createTarMock = jest.spyOn(tar, "createTar");
|
||||
|
||||
const saveCacheMock = jest.spyOn(cacheHttpClient, "saveCache");
|
||||
const compression = CompressionMethod.Zstd;
|
||||
const getCompressionMock = jest
|
||||
.spyOn(actionUtils, "getCompressionMethod")
|
||||
.mockReturnValue(Promise.resolve(compression));
|
||||
|
||||
await run();
|
||||
|
||||
expect(reserveCacheMock).toHaveBeenCalledTimes(1);
|
||||
expect(reserveCacheMock).toHaveBeenCalledWith(primaryKey);
|
||||
expect(reserveCacheMock).toHaveBeenCalledWith(primaryKey, {
|
||||
compressionMethod: compression
|
||||
});
|
||||
|
||||
const archiveFolder = "/foo/bar";
|
||||
const archiveFile = path.join(archiveFolder, CacheFilename);
|
||||
const archiveFile = path.join(archiveFolder, CacheFilename.Zstd);
|
||||
|
||||
expect(createTarMock).toHaveBeenCalledTimes(1);
|
||||
expect(createTarMock).toHaveBeenCalledWith(archiveFolder, cachePaths);
|
||||
expect(createTarMock).toHaveBeenCalledWith(
|
||||
archiveFolder,
|
||||
cachePaths,
|
||||
compression
|
||||
);
|
||||
|
||||
expect(saveCacheMock).toHaveBeenCalledTimes(1);
|
||||
expect(saveCacheMock).toHaveBeenCalledWith(cacheId, archiveFile);
|
||||
|
||||
expect(failedMock).toHaveBeenCalledTimes(0);
|
||||
expect(getCompressionMock).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue