feat: Skipping the job on PRs to non-default branches (#28)

apify · Aug 4, 2023 · e0a0f84 · e0a0f84
1 parent 006f81c
commit e0a0f84
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -433,7 +433,16 @@ async function run() {
             core.warning(`Skipping toolkit action for PR from external fork: ${(_b = github.context.payload.pull_request) === null || _b === void 0 ? void 0 : _b.head.repo.full_name}`);
             return;
         }
-        core.info('Pull request is from apify organization, not from an external fork.');
+        core.info('Pull request is from an apify organization, not from an external fork.');
+        // Skip when PR is not into the default branch. We only want to run this on PRs to develop or main when develop is not used but we
+        // don't want to run this on releases or PR chains.
+        const defaultBranch = github.context.payload.pull_request.head.repo.default_branch;
+        const targetBranch = github.context.payload.pull_request.base.ref;
+        if (defaultBranch !== targetBranch) {
+            core.info(`Skipping toolkit action for PR not into the default branch "${defaultBranch}" but "${targetBranch}" instead.`);
+            return;
+        }
+        core.info(`Pull request is into the default branch "${defaultBranch}"`);
         // Octokit configured with repository token - this can be used to modify pull-request.
         const repoToken = core.getInput('repo-token');
         const repoOctokit = github.getOctokit(repoToken);

diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/main.ts b/src/main.ts
@@ -29,7 +29,17 @@ async function run(): Promise<void> {
             core.warning(`Skipping toolkit action for PR from external fork: ${github.context.payload.pull_request?.head.repo.full_name}`);
             return;
         }
-        core.info('Pull request is from apify organization, not from an external fork.');
+        core.info('Pull request is from an apify organization, not from an external fork.');
+
+        // Skip when PR is not into the default branch. We only want to run this on PRs to develop or main when develop is not used but we
+        // don't want to run this on releases or PR chains.
+        const defaultBranch = github.context.payload.pull_request.head.repo.default_branch;
+        const targetBranch = github.context.payload.pull_request.base.ref;
+        if (defaultBranch !== targetBranch) {
+            core.info(`Skipping toolkit action for PR not into the default branch "${defaultBranch}" but "${targetBranch}" instead.`);
+            return;
+        }
+        core.info(`Pull request is into the default branch "${defaultBranch}"`);
 
         // Octokit configured with repository token - this can be used to modify pull-request.
         const repoToken = core.getInput('repo-token');