Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 8ce406f86a |
6
dist/index.js
vendored
6
dist/index.js
vendored
@@ -41404,11 +41404,11 @@ async function parse(previous, current) {
|
||||
result.delete.push(...parseRepoContents(repo, actions.removeRepo));
|
||||
}
|
||||
else if (isMove(actions)) {
|
||||
const moving = result.move = parseRepoContents(curr.repos[actions.addRepo], actions.removeRepo);
|
||||
prev && result.delete.push(...getDropped(parseRepoContents(prev.repos[actions.addRepo], actions.addRepo), moving));
|
||||
result.move = parseRepoContents(curr.repos[actions.addRepo], actions.removeRepo);
|
||||
prev && result.delete.push(...parseRepoContents(prev.repos[actions.addRepo], actions.addRepo));
|
||||
}
|
||||
else if ((result.build = isAdd(actions)) && prev) {
|
||||
result.delete.push(...getDropped(parseRepoContents(prev.repos[actions.addRepo], actions.addRepo), parseRepoContents(curr.repos[actions.addRepo], actions.addRepo)));
|
||||
result.delete.push(...parseRepoContents(prev.repos[actions.addRepo], actions.addRepo));
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
2
dist/index.js.map
vendored
2
dist/index.js.map
vendored
File diff suppressed because one or more lines are too long
4
package-lock.json
generated
4
package-lock.json
generated
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "pkgbase-yaml-parser",
|
||||
"version": "0.0.1",
|
||||
"version": "1.0.0",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "pkgbase-yaml-parser",
|
||||
"version": "0.0.1",
|
||||
"version": "1.0.0",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@actions/core": "^1.11.1",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "pkgbase-yaml-parser",
|
||||
"version": "0.0.1",
|
||||
"version": "1.0.0",
|
||||
"description": "compare Artix `pkgbase.yaml` files",
|
||||
"keywords": [
|
||||
"artix",
|
||||
|
||||
@@ -70,11 +70,11 @@ export async function parse(previous: string, current: string): Promise<Result>
|
||||
result.delete.push(...parseRepoContents(repo, actions.removeRepo));
|
||||
}
|
||||
else if (isMove(actions)) {
|
||||
const moving = result.move = parseRepoContents(curr.repos[actions.addRepo], actions.removeRepo);
|
||||
prev && result.delete.push(...getDropped(parseRepoContents(prev.repos[actions.addRepo], actions.addRepo), moving));
|
||||
result.move = parseRepoContents(curr.repos[actions.addRepo], actions.removeRepo);
|
||||
prev && result.delete.push(...parseRepoContents(prev.repos[actions.addRepo], actions.addRepo));
|
||||
}
|
||||
else if ((result.build = isAdd(actions)) && prev) {
|
||||
result.delete.push(...getDropped(parseRepoContents(prev.repos[actions.addRepo], actions.addRepo), parseRepoContents(curr.repos[actions.addRepo], actions.addRepo)));
|
||||
result.delete.push(...parseRepoContents(prev.repos[actions.addRepo], actions.addRepo));
|
||||
}
|
||||
|
||||
return result;
|
||||
|
||||
@@ -51,6 +51,18 @@ describe('pkgbase parser', () => {
|
||||
package: "pidgin",
|
||||
repository: "world",
|
||||
version: "2.14.14-3",
|
||||
},
|
||||
{
|
||||
"architecture": "x86_64",
|
||||
"package": "libpurple",
|
||||
"repository": "world",
|
||||
"version": "2.14.14-3",
|
||||
},
|
||||
{
|
||||
"architecture": "x86_64",
|
||||
"package": "finch",
|
||||
"repository": "world",
|
||||
"version": "2.14.14-3",
|
||||
}
|
||||
],
|
||||
actions: {
|
||||
@@ -78,7 +90,12 @@ describe('pkgbase parser', () => {
|
||||
version: "1:7.9.2-1",
|
||||
}
|
||||
],
|
||||
delete: [],
|
||||
delete: [{
|
||||
"architecture": "x86_64",
|
||||
"package": "opencascade",
|
||||
"repository": "world",
|
||||
"version": "1:7.9.1-1",
|
||||
}],
|
||||
actions: {
|
||||
addRepo: 'world',
|
||||
removeRepo: 'world-gremlins',
|
||||
@@ -116,6 +133,18 @@ describe('pkgbase parser', () => {
|
||||
package: "pidgin",
|
||||
repository: "world",
|
||||
version: "2.14.14-3",
|
||||
},
|
||||
{
|
||||
"architecture": "x86_64",
|
||||
"package": "libpurple",
|
||||
"repository": "world",
|
||||
"version": "2.14.14-3",
|
||||
},
|
||||
{
|
||||
"architecture": "x86_64",
|
||||
"package": "finch",
|
||||
"repository": "world",
|
||||
"version": "2.14.14-3",
|
||||
}
|
||||
],
|
||||
actions: {
|
||||
|
||||
Reference in New Issue
Block a user