Made it work
This commit is contained in:
222
app.ts
222
app.ts
@@ -1,15 +1,21 @@
|
||||
import * as core from "@actions/core";
|
||||
import { spawn } from "child_process";
|
||||
import fs from "fs/promises";
|
||||
import path from "path";
|
||||
import { ChildProcess, SpawnOptions } from "node:child_process";
|
||||
|
||||
const myToken = core.getInput("branches");
|
||||
|
||||
// Ignored branches
|
||||
const IGNORED_BRANCHES = ["master", "main", "dev", "release"];
|
||||
|
||||
type BranchDependencies = Record<string, null | string>;
|
||||
const mainBranch = "main";
|
||||
|
||||
enum Action {
|
||||
Rebase,
|
||||
Reset
|
||||
}
|
||||
|
||||
interface RebaseAction {
|
||||
branch: string,
|
||||
onBranch: string,
|
||||
action: Action
|
||||
}
|
||||
|
||||
/**
|
||||
* Helper function to run a Git command and capture stdout and stderr.
|
||||
@@ -44,63 +50,147 @@ const fetchBranches = async (): Promise<string[]> => {
|
||||
.filter((branch) => !IGNORED_BRANCHES.includes(branch) && branch !== "");
|
||||
}
|
||||
|
||||
/**
|
||||
* Detect dependencies between branches.
|
||||
*/
|
||||
const detectDependencies = async (branches: string[]): Promise<BranchDependencies> => {
|
||||
console.log("Detecting dependencies...");
|
||||
const dependencies: BranchDependencies = {};
|
||||
|
||||
for (const branch of branches) {
|
||||
dependencies[branch] = null; // Default: no dependency
|
||||
|
||||
for (const otherBranch of branches) {
|
||||
if (branch !== otherBranch) {
|
||||
const base = await runGitCommand(["merge-base", `origin/${branch}`, `origin/${otherBranch}`]);
|
||||
const isAncestor = await runGitCommand(["merge-base", "--is-ancestor", base.trim(), `origin/${branch}`]).catch(() => false);
|
||||
if (isAncestor) {
|
||||
dependencies[branch] = otherBranch;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return dependencies;
|
||||
}
|
||||
|
||||
/**
|
||||
* Perform a topological sort to determine the rebase order.
|
||||
*/
|
||||
const determineRebaseOrder = (dependencies: BranchDependencies) => {
|
||||
console.log("Determining rebase order...");
|
||||
const visited = new Set();
|
||||
const order = [];
|
||||
|
||||
const visit = (branch) => {
|
||||
if (visited.has(branch)) return;
|
||||
visited.add(branch);
|
||||
if (dependencies[branch]) visit(dependencies[branch]);
|
||||
order.push(branch);
|
||||
// Get the full commit history for a branch
|
||||
const getCommitsForBranch = async (branch: string): Promise<Set<string>> => {
|
||||
const commits = await runGitCommand(["rev-list", branch]);
|
||||
return new Set(commits.split("\n").filter(Boolean));
|
||||
};
|
||||
|
||||
Object.keys(dependencies).forEach((branch) => visit(branch));
|
||||
return order;
|
||||
const removeIgnoredBranches = (branchesWithDependencies: Record<string, any>) => {
|
||||
let withoutIgnoredBranches = {}
|
||||
for (const [branch, value] of Object.entries(branchesWithDependencies)) {
|
||||
if(!value.ignore) {
|
||||
withoutIgnoredBranches[branch] = value;
|
||||
}
|
||||
}
|
||||
return withoutIgnoredBranches;
|
||||
}
|
||||
|
||||
/**
|
||||
* Rebase a branch onto its base branch.
|
||||
*/
|
||||
const rebaseBranch = async (branch: string, baseBranch = "master"): Promise<void> => {
|
||||
console.log(`Rebasing ${branch} onto ${baseBranch}...`);
|
||||
try {
|
||||
await runGitCommand(["checkout", branch]);
|
||||
await runGitCommand(["fetch", "origin", baseBranch]);
|
||||
await runGitCommand(["rebase", `origin/${baseBranch}`]);
|
||||
console.log(`Rebase successful for ${branch}. Pushing...`);
|
||||
await runGitCommand(["push", "--force-with-lease"]);
|
||||
} catch (error) {
|
||||
console.error(`Rebase failed for ${branch}: ${error.message}`);
|
||||
await runGitCommand(["rebase", "--abort"]);
|
||||
// Build the dependency graph
|
||||
const buildRebaseDependencyGraph = async (branches: string[]): Promise<any> => {
|
||||
const commitHistories: Record<string, Set<string>> = {};
|
||||
for (const branch of branches) {
|
||||
commitHistories[branch] = await getCommitsForBranch(branch);
|
||||
}
|
||||
|
||||
let finalBranches: Record<string, {
|
||||
rebaseBranch?: string
|
||||
differenceWithRebase?: number
|
||||
equalBranches?: string[]
|
||||
ignore?: boolean
|
||||
}> = {};
|
||||
for (const branchA of branches) {
|
||||
for (const branchB of branches) {
|
||||
if(branchA !== branchB) {
|
||||
const infos = {
|
||||
superset: commitHistories[branchA].isSupersetOf(commitHistories[branchB]),
|
||||
difference: commitHistories[branchA].difference(commitHistories[branchB])
|
||||
}
|
||||
if (infos.superset) {
|
||||
if(branchB === mainBranch) {
|
||||
// SUPERSET OF MAIN BRANCH, MEANING ALREADY REBASED
|
||||
finalBranches[branchA] = {
|
||||
ignore: true
|
||||
}
|
||||
}
|
||||
if (infos.difference.size === 0) {
|
||||
const prevBranches: string[] = finalBranches[branchA]?.equalBranches ?? [];
|
||||
finalBranches[branchA] = {
|
||||
rebaseBranch: mainBranch,
|
||||
...finalBranches[branchA],
|
||||
equalBranches: [...prevBranches, branchB]
|
||||
};
|
||||
} else {
|
||||
if (branchA !== mainBranch && (!finalBranches[branchA] || finalBranches[branchA].differenceWithRebase > infos.difference.size)) {
|
||||
finalBranches[branchA] = {
|
||||
...finalBranches[branchA],
|
||||
rebaseBranch: branchB,
|
||||
differenceWithRebase: infos.difference.size
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Set rebase for branches with no dependencies
|
||||
for (const branch of branches) {
|
||||
if(branch !== mainBranch) {
|
||||
finalBranches[branch] = finalBranches[branch] ?? {
|
||||
rebaseBranch: mainBranch,
|
||||
differenceWithRebase: 0
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return removeIgnoredBranches(finalBranches);
|
||||
};
|
||||
|
||||
const rebaseOrder = (branchesWithDependencies: any): RebaseAction[] => {
|
||||
console.log("Order everything")
|
||||
|
||||
// First choose the right actions
|
||||
let orderedActions: RebaseAction[] = []
|
||||
for (const branch of Object.keys(branchesWithDependencies)) {
|
||||
const alreadyRebasedEqualBranch = orderedActions.find(action => branchesWithDependencies[branch].equalBranches?.some(otherBranch => otherBranch === action.branch))
|
||||
if(alreadyRebasedEqualBranch) {
|
||||
orderedActions.push({
|
||||
branch,
|
||||
onBranch: alreadyRebasedEqualBranch.branch,
|
||||
action: Action.Reset
|
||||
})
|
||||
} else {
|
||||
orderedActions.push({
|
||||
branch,
|
||||
onBranch: branchesWithDependencies[branch].rebaseBranch,
|
||||
action: Action.Rebase
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// Then order by differenceWithRebase and then add resets
|
||||
orderedActions = orderedActions.sort((a,b) => {
|
||||
const diffA = branchesWithDependencies[a.branch].differenceWithRebase;
|
||||
const diffB = branchesWithDependencies[b.branch].differenceWithRebase;
|
||||
return diffA - diffB;
|
||||
})
|
||||
|
||||
orderedActions = orderedActions.sort((a,b) => a.action - b.action)
|
||||
|
||||
return orderedActions;
|
||||
|
||||
}
|
||||
|
||||
const rebaseBranch = async ({
|
||||
branch,
|
||||
onBranch,
|
||||
action
|
||||
}: RebaseAction) => {
|
||||
await runGitCommand([
|
||||
"checkout",
|
||||
branch
|
||||
]);
|
||||
if(action === Action.Rebase) {
|
||||
await runGitCommand([
|
||||
"rebase",
|
||||
onBranch
|
||||
]);
|
||||
await runGitCommand([
|
||||
"push",
|
||||
"--force-with-lease"
|
||||
]);
|
||||
} else {
|
||||
await runGitCommand([
|
||||
"reset",
|
||||
"--hard",
|
||||
onBranch
|
||||
]);
|
||||
await runGitCommand([
|
||||
"push",
|
||||
"--force-with-lease"
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -110,24 +200,20 @@ const rebaseBranch = async (branch: string, baseBranch = "master"): Promise<void
|
||||
const main = async (): Promise<void> => {
|
||||
try {
|
||||
// Step 1: Fetch branches
|
||||
const branches: string[] = await fetchBranches();
|
||||
console.log(branches)
|
||||
await fs.writeFile(BRANCHES_FILE, branches.join("\n"), "utf-8");
|
||||
const branches: string[] = (await fetchBranches());
|
||||
branches.push(mainBranch)
|
||||
console.log("Branches:", branches);
|
||||
const dependencies = await buildRebaseDependencyGraph(branches);
|
||||
|
||||
// Step 2: Detect dependencies
|
||||
const dependencies = await detectDependencies(branches);
|
||||
await fs.writeFile(DEPENDENCIES_FILE, JSON.stringify(dependencies, null, 2), "utf-8");
|
||||
console.log("Dependencies:", dependencies);
|
||||
|
||||
// Step 3: Determine rebase order
|
||||
const order = determineRebaseOrder(dependencies);
|
||||
const order = rebaseOrder(dependencies);
|
||||
console.log("Rebase order:", order);
|
||||
|
||||
// Step 4: Rebase branches
|
||||
for (const branch of order) {
|
||||
const baseBranch = dependencies[branch] || "master";
|
||||
await rebaseBranch(branch, baseBranch);
|
||||
for (const rebaseAction of order) {
|
||||
await rebaseBranch(rebaseAction);
|
||||
}
|
||||
} catch (error) {
|
||||
console.error("Error during workflow execution:", error.message);
|
||||
|
||||
@@ -18,5 +18,6 @@
|
||||
"esbuild": "^0.24.0",
|
||||
"tsx": "^4.19.2",
|
||||
"typescript": "^5.7.2"
|
||||
}
|
||||
},
|
||||
"packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user