Skip to content
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

Jump to bottom

✅ Merge main into live #227

Merged
merged 1 commit into from
Dec 16, 2023
Merged

✅ Merge main into live #227

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
27 changes: 18 additions & 9 deletions .github/workflows/merge-main-to-live.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
});

core.startGroup('Resulting comparison');
core.info(compare);
core.info(JSON.stringify(compare, null, 2));
core.endGroup();

// Only create a pull request if there are changes in main, not in live.
Expand All @@ -52,11 +52,20 @@ jobs:
}

// Create a pull request from main to live
await github.rest.pulls.create({
owner,
repo,
head: 'main',
base: 'live',
title: '✅ Merge `main` into `live`',
body: '🤖 Queue merge when ready...',
});
try {
await github.rest.pulls.create({
owner,
repo,
head: 'main',
base: 'live',
title: '✅ Merge `main` into `live`',
body: '🤖 Queue merge when ready...',
});
} catch (error) {
if (error.status === 422 && error.message.includes('No commits between live and main')) {
core.warning('No commits between live and main');
return;
} else {
throw error;
}
}
Loading