@argos-ci/core 6.8.2 → 6.8.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.mjs +6 -1
- package/package.json +3 -3
package/dist/index.mjs
CHANGED
|
@@ -691,7 +691,12 @@ async function getTestMergeBaseCommitSha(input, ctx) {
|
|
|
691
691
|
return null;
|
|
692
692
|
}
|
|
693
693
|
const parents = await getCommitParents(sha);
|
|
694
|
-
if (parents?.length !== 2
|
|
694
|
+
if (parents?.length !== 2) {
|
|
695
|
+
debug(`${sha} is not a merge commit, ignoring the test-merge commit`);
|
|
696
|
+
return null;
|
|
697
|
+
}
|
|
698
|
+
if (ctx.env.GITHUB_REF === `refs/pull/${pullRequest.number}/merge`) return parents[0] ?? null;
|
|
699
|
+
if (parents[1] !== pullRequest.head.sha) {
|
|
695
700
|
debug(`${sha} is not a test-merge commit of #${pullRequest.number}`);
|
|
696
701
|
return null;
|
|
697
702
|
}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@argos-ci/core",
|
|
3
3
|
"description": "Node.js SDK for visual testing with Argos.",
|
|
4
|
-
"version": "6.8.
|
|
4
|
+
"version": "6.8.3",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": {
|
|
7
7
|
".": {
|
|
@@ -40,7 +40,7 @@
|
|
|
40
40
|
},
|
|
41
41
|
"dependencies": {
|
|
42
42
|
"@argos-ci/api-client": "0.31.0",
|
|
43
|
-
"@argos-ci/util": "4.
|
|
43
|
+
"@argos-ci/util": "4.2.0",
|
|
44
44
|
"convict": "^6.2.5",
|
|
45
45
|
"debug": "^4.4.3",
|
|
46
46
|
"fast-glob": "^3.3.3",
|
|
@@ -68,5 +68,5 @@
|
|
|
68
68
|
"lint": "eslint .",
|
|
69
69
|
"test": "vitest"
|
|
70
70
|
},
|
|
71
|
-
"gitHead": "
|
|
71
|
+
"gitHead": "b2a9a9d84dc14e148a68295f56cfdfec03f887f1"
|
|
72
72
|
}
|