Skip to content

AIRA-64: GitHub Actions Update #85

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
learn-design-develop merged 1 commit into from
Aug 5, 2025
Merged

AIRA-64: GitHub Actions Update #85

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
144 changes: 111 additions & 33 deletions .github/workflows/branch-cleanup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,12 @@ jobs:
cleanup-merged-branches:
runs-on: ubuntu-latest
if: github.event.pull_request.merged == true
permissions:
contents: write
pull-requests: read
steps:
- name: Delete merged branch
uses: actions/github-script@v6
uses: actions/github-script@v7
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
Expand All @@ -22,52 +25,127 @@ jobs:
// Only delete branches from main repo, not forks
if (!isFromFork && !branchName.includes('main') && !branchName.includes('master')) {
try {
await github.rest.git.deleteRef({
owner: context.repo.owner,
repo: context.repo.repo,
ref: `heads/${branchName}`
});
console.log(`✅ Deleted merged branch: ${branchName}`);
// Check if branch has protection rules
let hasProtection = false;
try {
await github.rest.repos.getBranchProtection({
owner: context.repo.owner,
repo: context.repo.repo,
branch: branchName
});
hasProtection = true;
console.log(`⚠️ Branch ${branchName} has protection rules, skipping deletion`);
} catch (protectionError) {
// No protection rules, safe to delete
console.log(`Branch ${branchName} has no protection rules`);
}

if (!hasProtection) {
await github.rest.git.deleteRef({
owner: context.repo.owner,
repo: context.repo.repo,
ref: `heads/${branchName}`
});
console.log(`✅ Deleted merged branch: ${branchName}`);
}
} catch (error) {
console.log(`❌ Failed to delete branch ${branchName}: ${error.message}`);

// If deletion fails due to permissions, suggest manual cleanup
if (error.message.includes('Resource not accessible')) {
console.log(`💡 Manual cleanup required for branch ${branchName}`);
console.log('This may be due to branch protection rules or insufficient permissions.');
}
}
} else if (isFromFork) {
console.log(`🔀 Skipping fork branch: ${branchName}`);
} else {
console.log(`🔒 Skipping protected branch: ${branchName}`);
}

cleanup-stale-branches:
runs-on: ubuntu-latest
if: github.event_name == 'schedule'
permissions:
contents: write
pull-requests: read
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ secrets.GITHUB_TOKEN }}

- name: Cleanup stale branches
run: |
# Get branches older than 30 days with no recent activity
CUTOFF_DATE=$(date -d '30 days ago' +%s)

git for-each-ref --format='%(refname:short) %(committerdate:unix)' refs/remotes/origin/ |
while read branch timestamp; do
branch_name=${branch#origin/}
uses: actions/github-script@v7
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
const { execSync } = require('child_process');

# Skip protected branches
if [[ "$branch_name" == "main" || "$branch_name" == "master" || "$branch_name" =~ ^release/ ]]; then
continue
fi
// Get branches older than 30 days with no recent activity
const cutoffDate = Math.floor(Date.now() / 1000) - (30 * 24 * 60 * 60);

if [ "$timestamp" -lt "$CUTOFF_DATE" ]; then
echo "🗑️ Stale branch found: $branch_name (last activity: $(date -d @$timestamp))"

# Check if branch has open PR
PR_COUNT=$(gh pr list --head "$branch_name" --json number --jq length)
try {
const branchOutput = execSync('git for-each-ref --format="%(refname:short) %(committerdate:unix)" refs/remotes/origin/', { encoding: 'utf8' });
const branches = branchOutput.trim().split('\n').filter(line => line.trim());

if [ "$PR_COUNT" -eq 0 ]; then
echo "Deleting stale branch: $branch_name"
git push origin --delete "$branch_name" || echo "Failed to delete $branch_name"
else
echo "Branch $branch_name has open PR, skipping deletion"
fi
fi
done
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
for (const line of branches) {
const [fullBranch, timestamp] = line.split(' ');
const branchName = fullBranch.replace('origin/', '');

// Skip protected branches
if (['main', 'master'].includes(branchName) || branchName.startsWith('release/')) {
continue;
}

if (parseInt(timestamp) < cutoffDate) {
const lastActivity = new Date(parseInt(timestamp) * 1000).toLocaleDateString();
console.log(`🗑️ Stale branch found: ${branchName} (last activity: ${lastActivity})`);

// Check if branch has open PR
try {
const prs = await github.rest.pulls.list({
owner: context.repo.owner,
repo: context.repo.repo,
head: `${context.repo.owner}:${branchName}`,
state: 'open'
});

if (prs.data.length === 0) {
// Check for branch protection
let hasProtection = false;
try {
await github.rest.repos.getBranchProtection({
owner: context.repo.owner,
repo: context.repo.repo,
branch: branchName
});
hasProtection = true;
console.log(`⚠️ Branch ${branchName} has protection rules, skipping deletion`);
} catch (protectionError) {
// No protection rules
}

if (!hasProtection) {
try {
await github.rest.git.deleteRef({
owner: context.repo.owner,
repo: context.repo.repo,
ref: `heads/${branchName}`
});
console.log(`✅ Deleted stale branch: ${branchName}`);
} catch (deleteError) {
console.log(`❌ Failed to delete ${branchName}: ${deleteError.message}`);
}
}
} else {
console.log(`Branch ${branchName} has open PR, skipping deletion`);
}
} catch (error) {
console.log(`Error checking PRs for ${branchName}: ${error.message}`);
}
}
}
} catch (error) {
console.log('Error during stale branch cleanup:', error.message);
}
96 changes: 88 additions & 8 deletions .github/workflows/project-automation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,13 @@ jobs:
script: |
const PROJECT_ID = process.env.PROJECT_ID;

// Helper function to get project info by ID
// Helper function to get project info
async function getProjectInfo() {
const query = `
query($projectId: ID!) {
node(id: $projectId) {
... on ProjectV2 {
// Try organization project first
let query = `
query($org: String!, $projectNumber: Int!) {
organization(login: $org) {
projectV2(number: $projectNumber) {
id
fields(first: 20) {
nodes {
Expand All @@ -49,20 +50,100 @@ jobs:
`;

try {
// If PROJECT_ID is a number, use it as project number
if (/^\d+$/.test(PROJECT_ID)) {
const result = await github.graphql(query, {
org: context.repo.owner,
projectNumber: parseInt(PROJECT_ID)
});
return result.organization.projectV2;
}

// Otherwise try as global ID
query = `
query($projectId: ID!) {
node(id: $projectId) {
... on ProjectV2 {
id
fields(first: 20) {
nodes {
... on ProjectV2Field {
id
name
}
... on ProjectV2SingleSelectField {
id
name
options {
id
name
}
}
}
}
}
}
}
`;

const result = await github.graphql(query, {
projectId: PROJECT_ID
});
return result.node;
} catch (error) {
console.log('Error fetching project info:', error);

// Try repository-level project as fallback
try {
query = `
query($owner: String!, $repo: String!, $projectNumber: Int!) {
repository(owner: $owner, name: $repo) {
projectV2(number: $projectNumber) {
id
fields(first: 20) {
nodes {
... on ProjectV2Field {
id
name
}
... on ProjectV2SingleSelectField {
id
name
options {
id
name
}
}
}
}
}
}
}
`;

if (/^\d+$/.test(PROJECT_ID)) {
const result = await github.graphql(query, {
owner: context.repo.owner,
repo: context.repo.repo,
projectNumber: parseInt(PROJECT_ID)
});
return result.repository.projectV2;
}
} catch (fallbackError) {
console.log('Repository project fallback failed:', fallbackError);
}

return null;
}
}

// Helper function to get item ID for issue/PR
async function getProjectItemId(contentId) {
const projectInfo = await getProjectInfo();
if (!projectInfo) return null;

const query = `
query($projectId: ID!, $contentId: ID!) {
query($projectId: ID!) {
node(id: $projectId) {
... on ProjectV2 {
items(first: 100) {
Expand All @@ -85,8 +166,7 @@ jobs:

try {
const result = await github.graphql(query, {
projectId: PROJECT_ID,
contentId
projectId: projectInfo.id
});

const item = result.node.items.nodes.find(
Expand Down