Skip to content

refactor: move gitConfig logic to parent and call it in child using super.gitConfig() #590

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
maxprilutskiy merged 7 commits into from
Apr 9, 2025
Merged

refactor: move gitConfig logic to parent and call it in child using super.gitConfig() #590

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9c8e243
fix(git): add more robust error handling for Git operation
SXsid Mar 25, 2025
6d3272c
revert: multi-platform refactoring to align with issue changes requested
SXsid Mar 26, 2025
71471a7
Merge branch 'main' of https://github.com/SXsid/lingo.dev
SXsid Mar 27, 2025
1e69d1a
fix(action): refactor gitConfig to reduce redundancy for GitHub, GitL…
SXsid Mar 27, 2025
0658bc8
refactor: remove unnecessary imports
SXsid Mar 27, 2025
013661d
Merge branch 'main' into main
maxprilutskiy Apr 4, 2025
547d698
Merge branch 'main' into main
maxprilutskiy Apr 9, 2025
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
9 changes: 8 additions & 1 deletion action/src/platforms/_base.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { execSync } from "child_process";
import Z from "zod";

const defaultMessage = "feat: update translations via @lingodotdev";
Expand All @@ -23,7 +24,13 @@ export abstract class PlatformKit<PlatformConfig extends BasePlatformConfig = Ba

abstract buildPullRequestUrl(pullRequestNumber: number): string;

gitConfig(): Promise<void> | void {}
gitConfig(token?: string, repoUrl?: string) {
if (token && repoUrl) {
execSync(`git remote set-url origin ${repoUrl}`, {
stdio: "inherit",
});
}
}

get config() {
const env = Z.object({
Expand Down
6 changes: 1 addition & 5 deletions action/src/platforms/github.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ import { Octokit } from "octokit";
import { PlatformKit } from "./_base.js";
import Z from "zod";

import { execSync } from "child_process";

export class GitHubPlatformKit extends PlatformKit {
private _octokit?: Octokit;

Expand Down Expand Up @@ -79,9 +77,7 @@ export class GitHubPlatformKit extends PlatformKit {

const url = `https://${ghToken}@github.com/${repositoryOwner}/${repositoryName}.git`;

execSync(`git remote set-url origin ${url}`, {
stdio: "inherit",
});
super.gitConfig(ghToken, url);
}
}

Expand Down
8 changes: 3 additions & 5 deletions action/src/platforms/gitlab.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { Gitlab } from "@gitbeaker/rest";
import Z from "zod";
import { PlatformKit } from "./_base.js";
import { execSync } from "child_process";

const gl = new Gitlab({ token: "" });

Expand Down Expand Up @@ -91,11 +90,10 @@ export class GitlabPlatformKit extends PlatformKit {
}

gitConfig(): Promise<void> | void {
const url = `https://oauth2:${this.platformConfig.glToken}@gitlab.com/${this.platformConfig.repositoryOwner}/${this.platformConfig.repositoryName}.git`;
const glToken = this.platformConfig.glToken;
const url = `https://oauth2:${glToken}@gitlab.com/${this.platformConfig.repositoryOwner}/${this.platformConfig.repositoryName}.git`;

execSync(`git remote set-url origin ${url}`, {
stdio: "inherit",
});
super.gitConfig(glToken, url);
}

buildPullRequestUrl(pullRequestNumber: number): string {
Expand Down