Improve remote tracking
This commit is contained in:
@@ -83327,7 +83327,7 @@ function query({
|
||||
// package.json
|
||||
var package_default = {
|
||||
name: "@pullfrog/action",
|
||||
version: "0.0.142",
|
||||
version: "0.0.143",
|
||||
type: "module",
|
||||
files: [
|
||||
"index.js",
|
||||
@@ -123148,19 +123148,19 @@ function PushBranchTool(ctx) {
|
||||
parameters: PushBranch,
|
||||
execute: execute(ctx, async ({ branchName, force }) => {
|
||||
const branch = branchName || $("git", ["rev-parse", "--abbrev-ref", "HEAD"], { log: false });
|
||||
log.info(`Pushing branch ${branch} to ${remote}`);
|
||||
const isUrl = remote.startsWith("https://");
|
||||
const args3 = force ? ["push", "--force", ...isUrl ? [] : ["-u"], remote, branch] : ["push", ...isUrl ? [] : ["-u"], remote, branch];
|
||||
log.info(`Pushing branch ${branch} to ${isUrl ? "(fork URL)" : remote}`);
|
||||
if (force) {
|
||||
log.warning(`Force pushing - this will overwrite remote history`);
|
||||
$("git", ["push", "--force", "-u", remote, branch]);
|
||||
} else {
|
||||
$("git", ["push", "-u", remote, branch]);
|
||||
}
|
||||
$("git", args3);
|
||||
return {
|
||||
success: true,
|
||||
branch,
|
||||
remote,
|
||||
remote: isUrl ? "(fork URL)" : remote,
|
||||
force,
|
||||
message: `Successfully pushed branch ${branch} to ${remote}`
|
||||
message: `Successfully pushed branch ${branch}`
|
||||
};
|
||||
})
|
||||
});
|
||||
@@ -123859,7 +123859,7 @@ function setupGitConfig() {
|
||||
);
|
||||
}
|
||||
}
|
||||
function setupGit(ctx) {
|
||||
async function setupGit(ctx) {
|
||||
const repoDir = process.cwd();
|
||||
log.info("\u{1F527} Setting up git authentication...");
|
||||
try {
|
||||
@@ -123885,29 +123885,25 @@ function setupGit(ctx) {
|
||||
env: { GH_TOKEN: ctx.githubInstallationToken }
|
||||
});
|
||||
log.info(`\u2713 Successfully checked out PR #${prNumber}`);
|
||||
const pushRemote = detectPushRemote();
|
||||
if (pushRemote !== "origin") {
|
||||
log.info(`\u{1F374} Fork PR detected, will push to remote: ${pushRemote}`);
|
||||
const forkUrl = $("git", ["remote", "get-url", pushRemote], { cwd: repoDir, log: false });
|
||||
const authedForkUrl = forkUrl.replace(
|
||||
"https://github.com/",
|
||||
`https://x-access-token:${ctx.githubInstallationToken}@github.com/`
|
||||
const pr = await ctx.octokit.rest.pulls.get({
|
||||
owner: ctx.owner,
|
||||
repo: ctx.name,
|
||||
pull_number: prNumber
|
||||
});
|
||||
const headRepo = pr.data.head.repo;
|
||||
const baseRepo = pr.data.base.repo;
|
||||
if (!headRepo || headRepo.full_name === baseRepo.full_name) {
|
||||
return { pushRemote: "origin" };
|
||||
}
|
||||
if (!pr.data.maintainer_can_modify) {
|
||||
log.warning(
|
||||
`\u26A0\uFE0F Fork PR from ${headRepo.owner.login} does not allow maintainer edits. Push may fail.`
|
||||
);
|
||||
$("git", ["remote", "set-url", pushRemote, authedForkUrl], { cwd: repoDir });
|
||||
log.info(`\u2713 Updated ${pushRemote} URL with authentication token`);
|
||||
}
|
||||
return { pushRemote };
|
||||
}
|
||||
function detectPushRemote() {
|
||||
try {
|
||||
const branch = $("git", ["rev-parse", "--abbrev-ref", "HEAD"], { log: false });
|
||||
const upstream = $("git", ["rev-parse", "--abbrev-ref", `${branch}@{upstream}`], {
|
||||
log: false
|
||||
});
|
||||
return upstream.split("/")[0];
|
||||
} catch {
|
||||
return "origin";
|
||||
}
|
||||
const token = process.env.GITHUB_TOKEN || ctx.githubInstallationToken;
|
||||
const forkUrl = `https://x-access-token:${token}@github.com/${headRepo.full_name}.git`;
|
||||
log.info(`\u{1F374} Fork PR detected, will push to: ${headRepo.full_name}`);
|
||||
return { pushRemote: forkUrl };
|
||||
}
|
||||
|
||||
// utils/timer.ts
|
||||
@@ -123946,7 +123942,7 @@ async function main(inputs) {
|
||||
const partialCtx = await initializeContext(inputs, payload);
|
||||
const ctx = partialCtx;
|
||||
timer.checkpoint("initializeContext");
|
||||
const { pushRemote } = setupGit(ctx);
|
||||
const { pushRemote } = await setupGit(ctx);
|
||||
ctx.pushRemote = pushRemote;
|
||||
timer.checkpoint("setupGit");
|
||||
await setupTempDirectory(ctx);
|
||||
|
||||
Reference in New Issue
Block a user