Skip to content

Commit 75b4b65

Browse files
committed
fix: Sync master to develop through Apify Service Account [internal]
1 parent b5b9f12 commit 75b4b65

File tree

1 file changed

+4
-42
lines changed

1 file changed

+4
-42
lines changed

.github/workflows/sync_branches.yaml

Lines changed: 4 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,10 @@ jobs:
6060
throw new Error(`Don't know how to handle event name: ${eventName}`);
6161
}
6262
63-
// Create pull request
64-
const createResp = await github.rest.pulls.create({
63+
// Create pull request as Apify Service Account
64+
// Apify Service Account does not trigger PR toolkit,
65+
// does not need approval for PRs and does not need to wait for status checks
66+
const createResp = await octokit.rest.pulls.create({
6567
owner: context.repo.owner,
6668
repo: context.repo.repo,
6769
head: headBranch,
@@ -71,46 +73,6 @@ jobs:
7173
7274
const pullRequestNumber = createResp.data.number;
7375
74-
// Approve pull request
75-
await octokit.request('POST /repos/{owner}/{repo}/pulls/{pull_number}/reviews', {
76-
owner: context.repo.owner,
77-
repo: context.repo.repo,
78-
pull_number: pullRequestNumber,
79-
body: 'Auto-approving pull request',
80-
event: 'APPROVE',
81-
})
82-
83-
// Wait for PR toolkit to finish (up to 3 minutes) on the pull request
84-
let i = 0;
85-
let prToolkitSuccessful = false;
86-
while (i++ < 60) {
87-
const resp = await github.rest.checks.listForRef({
88-
owner: context.repo.owner,
89-
repo: context.repo.repo,
90-
ref: `pull/${pullRequestNumber}/head`,
91-
check_name: 'apify-pr-toolkit',
92-
});
93-
94-
if (resp.data.check_runs.length > 1) {
95-
throw new Error('There are more than one PR toolkit runs, this should be impossible');
96-
}
97-
98-
if (resp.data.check_runs.length === 1 && resp.data.check_runs[0].status === 'completed') {
99-
if (resp.data.check_runs[0].conclusion === 'success') {
100-
console.log('PR toolkit succeeded');
101-
prToolkitSuccessful = true;
102-
break;
103-
} else {
104-
throw new Error('PR toolkit failed');
105-
}
106-
}
107-
108-
await new Promise((resolve) => setTimeout(resolve, 3000));
109-
}
110-
if (!prToolkitSuccessful) {
111-
throw new Error('PR toolkit check did not finish in time');
112-
}
113-
11476
// Merge pull request
11577
await github.rest.pulls.merge({
11678
owner: context.repo.owner,

0 commit comments

Comments
 (0)