mirror of
https://code.forgejo.org/actions/cache.git
synced 2024-11-30 23:59:16 +01:00
Merge pull request #942 from actions/vsvipul/fix-sort
Remove sort logic from inputs
This commit is contained in:
commit
edc49897ec
5 changed files with 7 additions and 27 deletions
|
@ -215,23 +215,6 @@ test("getInputAsArray handles empty lines correctly", () => {
|
||||||
expect(actionUtils.getInputAsArray("foo")).toEqual(["bar", "baz"]);
|
expect(actionUtils.getInputAsArray("foo")).toEqual(["bar", "baz"]);
|
||||||
});
|
});
|
||||||
|
|
||||||
test("getInputAsArray sorts files correctly", () => {
|
|
||||||
testUtils.setInput(
|
|
||||||
"foo",
|
|
||||||
"bar\n!baz\nwaldo\nqux\nquux\ncorge\ngrault\ngarply"
|
|
||||||
);
|
|
||||||
expect(actionUtils.getInputAsArray("foo")).toEqual([
|
|
||||||
"!baz",
|
|
||||||
"bar",
|
|
||||||
"corge",
|
|
||||||
"garply",
|
|
||||||
"grault",
|
|
||||||
"quux",
|
|
||||||
"qux",
|
|
||||||
"waldo"
|
|
||||||
]);
|
|
||||||
});
|
|
||||||
|
|
||||||
test("getInputAsArray removes spaces after ! at the beginning", () => {
|
test("getInputAsArray removes spaces after ! at the beginning", () => {
|
||||||
testUtils.setInput(
|
testUtils.setInput(
|
||||||
"foo",
|
"foo",
|
||||||
|
@ -240,11 +223,11 @@ test("getInputAsArray removes spaces after ! at the beginning", () => {
|
||||||
expect(actionUtils.getInputAsArray("foo")).toEqual([
|
expect(actionUtils.getInputAsArray("foo")).toEqual([
|
||||||
"!bar",
|
"!bar",
|
||||||
"!baz",
|
"!baz",
|
||||||
"!quux",
|
|
||||||
"!qux",
|
"!qux",
|
||||||
"!waldo",
|
"!quux",
|
||||||
"corge",
|
"corge",
|
||||||
"grault! garply"
|
"grault! garply",
|
||||||
|
"!waldo"
|
||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -147,7 +147,7 @@ test("restore with no key", async () => {
|
||||||
test("restore with too many keys should fail", async () => {
|
test("restore with too many keys should fail", async () => {
|
||||||
const path = "node_modules";
|
const path = "node_modules";
|
||||||
const key = "node-test";
|
const key = "node-test";
|
||||||
const restoreKeys = [...Array(20).keys()].map(x => x.toString()).sort();
|
const restoreKeys = [...Array(20).keys()].map(x => x.toString());
|
||||||
testUtils.setInputs({
|
testUtils.setInputs({
|
||||||
path: path,
|
path: path,
|
||||||
key,
|
key,
|
||||||
|
|
3
dist/restore/index.js
vendored
3
dist/restore/index.js
vendored
|
@ -38437,8 +38437,7 @@ function getInputAsArray(name, options) {
|
||||||
.getInput(name, options)
|
.getInput(name, options)
|
||||||
.split("\n")
|
.split("\n")
|
||||||
.map(s => s.replace(/^!\s+/, "!").trim())
|
.map(s => s.replace(/^!\s+/, "!").trim())
|
||||||
.filter(x => x !== "")
|
.filter(x => x !== "");
|
||||||
.sort();
|
|
||||||
}
|
}
|
||||||
exports.getInputAsArray = getInputAsArray;
|
exports.getInputAsArray = getInputAsArray;
|
||||||
function getInputAsInt(name, options) {
|
function getInputAsInt(name, options) {
|
||||||
|
|
3
dist/save/index.js
vendored
3
dist/save/index.js
vendored
|
@ -38437,8 +38437,7 @@ function getInputAsArray(name, options) {
|
||||||
.getInput(name, options)
|
.getInput(name, options)
|
||||||
.split("\n")
|
.split("\n")
|
||||||
.map(s => s.replace(/^!\s+/, "!").trim())
|
.map(s => s.replace(/^!\s+/, "!").trim())
|
||||||
.filter(x => x !== "")
|
.filter(x => x !== "");
|
||||||
.sort();
|
|
||||||
}
|
}
|
||||||
exports.getInputAsArray = getInputAsArray;
|
exports.getInputAsArray = getInputAsArray;
|
||||||
function getInputAsInt(name, options) {
|
function getInputAsInt(name, options) {
|
||||||
|
|
|
@ -62,8 +62,7 @@ export function getInputAsArray(
|
||||||
.getInput(name, options)
|
.getInput(name, options)
|
||||||
.split("\n")
|
.split("\n")
|
||||||
.map(s => s.replace(/^!\s+/, "!").trim())
|
.map(s => s.replace(/^!\s+/, "!").trim())
|
||||||
.filter(x => x !== "")
|
.filter(x => x !== "");
|
||||||
.sort();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export function getInputAsInt(
|
export function getInputAsInt(
|
||||||
|
|
Loading…
Reference in a new issue