@graphql-inspector/action 3.2.0 → 3.3.0

package/index.js

@@ -12437,8 +12437,14 @@ function getCurrentCommitSha() {
     }
     return sha;
 }
+function getAssociatedPullRequest(octokit, commitSha) {
+    return tslib.__awaiter(this, void 0, void 0, function* () {
+        const result = yield octokit.request('GET /repos/{owner}/{repo}/commits/{commit_sha}/pulls', Object.assign(Object.assign({}, github$1.context.repo), { commit_sha: commitSha }));
+        return result.data.length > 0 ? result.data[0] : null;
+    });
+}
 function run() {
-    var _a, _b, _c;
+    var _a, _b;
     return tslib.__awaiter(this, void 0, void 0, function* () {
         core.info(`GraphQL Inspector started`);
         // env
@@ -12460,6 +12466,8 @@ function run() {
         const octokit = github$1.getOctokit(token);
         // repo
         const { owner, repo } = github$1.context.repo;
+        // pull request
+        const pullRequest = yield getAssociatedPullRequest(octokit, commitSha);
         core.info(`Creating a check named "${checkName}"`);
         const check = yield octokit.checks.create({
             owner,
@@ -12481,11 +12489,11 @@ function run() {
             return core.setFailed('Failed to find `schema` variable');
         }
         let [schemaRef, schemaPath] = schemaPointer.split(':');
-        if (useMerge && github$1.context.payload.pull_request) {
-            ref = `refs/pull/${github$1.context.payload.pull_request.number}/merge`;
+        if (useMerge && (pullRequest === null || pullRequest === void 0 ? void 0 : pullRequest.state) == 'open') {
+            ref = `refs/pull/${pullRequest.number}/merge`;
             workspace = undefined;
             core.info(`EXPERIMENTAL - Using Pull Request ${ref}`);
-            const baseRef = (_b = (_a = github$1.context.payload.pull_request) === null || _a === void 0 ? void 0 : _a.base) === null || _b === void 0 ? void 0 : _b.ref;
+            const baseRef = (_a = pullRequest.base) === null || _a === void 0 ? void 0 : _a.ref;
             if (baseRef) {
                 schemaRef = baseRef;
                 core.info(`EXPERIMENTAL - Using ${baseRef} as base schema ref`);
@@ -12546,9 +12554,7 @@ function run() {
         const changes = action.changes || [];
         core.setOutput('changes', `${changes.length || 0}`);
         core.info(`Changes: ${changes.length || 0}`);
-        const hasApprovedBreakingChangeLabel = github$1.context.payload.pull_request
-            ? (_c = github$1.context.payload.pull_request.labels) === null || _c === void 0 ? void 0 : _c.some((label) => label.name === approveLabel)
-            : false;
+        const hasApprovedBreakingChangeLabel = (_b = pullRequest === null || pullRequest === void 0 ? void 0 : pullRequest.labels) === null || _b === void 0 ? void 0 : _b.some((label) => label.name === approveLabel);
         // Force Success when failOnBreaking is disabled
         if ((failOnBreaking === false || hasApprovedBreakingChangeLabel) &&
             conclusion === github.CheckConclusion.Failure) {

package/index.mjs

@@ -12435,8 +12435,14 @@ function getCurrentCommitSha() {
     }
     return sha;
 }
+function getAssociatedPullRequest(octokit, commitSha) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const result = yield octokit.request('GET /repos/{owner}/{repo}/commits/{commit_sha}/pulls', Object.assign(Object.assign({}, context.repo), { commit_sha: commitSha }));
+        return result.data.length > 0 ? result.data[0] : null;
+    });
+}
 function run() {
-    var _a, _b, _c;
+    var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
         info(`GraphQL Inspector started`);
         // env
@@ -12458,6 +12464,8 @@ function run() {
         const octokit = getOctokit(token);
         // repo
         const { owner, repo } = context.repo;
+        // pull request
+        const pullRequest = yield getAssociatedPullRequest(octokit, commitSha);
         info(`Creating a check named "${checkName}"`);
         const check = yield octokit.checks.create({
             owner,
@@ -12479,11 +12487,11 @@ function run() {
             return setFailed('Failed to find `schema` variable');
         }
         let [schemaRef, schemaPath] = schemaPointer.split(':');
-        if (useMerge && context.payload.pull_request) {
-            ref = `refs/pull/${context.payload.pull_request.number}/merge`;
+        if (useMerge && (pullRequest === null || pullRequest === void 0 ? void 0 : pullRequest.state) == 'open') {
+            ref = `refs/pull/${pullRequest.number}/merge`;
             workspace = undefined;
             info(`EXPERIMENTAL - Using Pull Request ${ref}`);
-            const baseRef = (_b = (_a = context.payload.pull_request) === null || _a === void 0 ? void 0 : _a.base) === null || _b === void 0 ? void 0 : _b.ref;
+            const baseRef = (_a = pullRequest.base) === null || _a === void 0 ? void 0 : _a.ref;
             if (baseRef) {
                 schemaRef = baseRef;
                 info(`EXPERIMENTAL - Using ${baseRef} as base schema ref`);
@@ -12544,9 +12552,7 @@ function run() {
         const changes = action.changes || [];
         setOutput('changes', `${changes.length || 0}`);
         info(`Changes: ${changes.length || 0}`);
-        const hasApprovedBreakingChangeLabel = context.payload.pull_request
-            ? (_c = context.payload.pull_request.labels) === null || _c === void 0 ? void 0 : _c.some((label) => label.name === approveLabel)
-            : false;
+        const hasApprovedBreakingChangeLabel = (_b = pullRequest === null || pullRequest === void 0 ? void 0 : pullRequest.labels) === null || _b === void 0 ? void 0 : _b.some((label) => label.name === approveLabel);
         // Force Success when failOnBreaking is disabled
         if ((failOnBreaking === false || hasApprovedBreakingChangeLabel) &&
             conclusion === CheckConclusion.Failure) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-inspector/action",
-  "version": "3.2.0",
+  "version": "3.3.0",
   "description": "GraphQL Inspector functionality for GitHub Actions",
   "sideEffects": false,
   "dependencies": {