Skip to content

Version 1.3.35 - 2025-08-20 23:15:55 #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Kixo merged 1 commit into from
Aug 20, 2025
Merged

Version 1.3.35 - 2025-08-20 23:15:55 #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 36 additions & 25 deletions .github/workflows/merge-when-green.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,34 +34,45 @@ jobs:
uses: actions/github-script@v7
with:
script: |
const prNumber = parseInt('${{ steps.find_pr.outputs.pr_number }}', 10);
const { data: pr } = await github.pulls.get({
owner: context.repo.owner,
repo: context.repo.repo,
pull_number: prNumber,
});
if (pr.draft) {
core.info(`PR #${prNumber} is draft. Skipping.`);
return;
}
if (pr.state !== 'open') {
core.info(`PR #${prNumber} is not open. Skipping.`);
return;
}
if (!['master','main'].includes(pr.base.ref)) {
core.info(`PR #${prNumber} base is ${pr.base.ref}, not master/main. Skipping.`);
return;
}
const { data: prDetails } = await github.pulls.get({
owner: context.repo.owner,
repo: context.repo.repo,
pull_number: prNumber,
});
if (prDetails.mergeable_state !== 'clean' && prDetails.mergeable_state !== 'has_hooks') {
core.info(`PR #${prNumber} mergeable_state=${prDetails.mergeable_state}. Not clean yet.`);
// Check if github object is available
if (!github) {
core.setFailed('GitHub API is not available in this context');
return;
}

const prNumber = parseInt('${{ steps.find_pr.outputs.pr_number }}', 10);

try {
const { data: pr } = await github.pulls.get({
owner: context.repo.owner,
repo: context.repo.repo,
pull_number: prNumber,
});

if (pr.draft) {
core.info(`PR #${prNumber} is draft. Skipping.`);
return;
}
if (pr.state !== 'open') {
core.info(`PR #${prNumber} is not open. Skipping.`);
return;
}
if (!['master','main'].includes(pr.base.ref)) {
core.info(`PR #${prNumber} base is ${pr.base.ref}, not master/main. Skipping.`);
return;
}

const { data: prDetails } = await github.pulls.get({
owner: context.repo.owner,
repo: context.repo.repo,
pull_number: prNumber,
});

if (prDetails.mergeable_state !== 'clean' && prDetails.mergeable_state !== 'has_hooks') {
core.info(`PR #${prNumber} mergeable_state=${prDetails.mergeable_state}. Not clean yet.`);
return;
}

await github.pulls.merge({
owner: context.repo.owner,
repo: context.repo.repo,
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@icpay/sdk",
"version": "1.3.34",
"version": "1.3.35",
"description": "Official icpay SDK for Internet Computer payments",
"main": "dist/index.js",
"types": "dist/index.d.ts",
Expand Down