Skip to content

Add auto-recovery, healthchecks, systemd service, replace drone SVG w… #140

Add auto-recovery, healthchecks, systemd service, replace drone SVG w…

Add auto-recovery, healthchecks, systemd service, replace drone SVG w… #140

Workflow file for this run

name: Auto-merge to claude/dev
on:
push:
branches:
- 'claude/fresh-session-setup-uw6vw'
permissions:
contents: write
pull-requests: write
jobs:
merge-to-dev:
runs-on: ubuntu-latest
steps:
- name: Merge via GitHub API
uses: actions/github-script@v7
with:
script: |
const owner = context.repo.owner;
const repo = context.repo.repo;
const head = 'claude/fresh-session-setup-uw6vw';
const base = 'claude/dev';
// Try direct merge first
try {
const result = await github.rest.repos.merge({
owner,
repo,
base,
head,
commit_message: `Auto-merge ${head} into ${base}`
});
console.log(`Merge successful: ${result.data.sha}`);
} catch (error) {
console.log(`Direct merge failed: ${error.message}`);
console.log('Attempting PR-based merge...');
// Create a PR and merge it
try {
const { data: pr } = await github.rest.pulls.create({
owner,
repo,
title: `Auto-merge into ${base}`,
head,
base,
body: `Automated merge from ${head}`
});
console.log(`PR #${pr.number} created`);
await github.rest.pulls.merge({
owner,
repo,
pull_number: pr.number,
merge_method: 'merge'
});
console.log(`PR #${pr.number} merged successfully`);
} catch (prError) {
core.setFailed(`PR merge also failed: ${prError.message}`);
}
}