Allow doing testmerges from different repositories for forks. by misleadingname · Pull Request #2431 · tgstation/tgstation-server

misleadingname · 2026-02-14T14:17:45Z

🆑 REST API
Added support for performing test merges from different repositories, enabling fork workflows that track upstream PRs.
/:cl:

🆑 Nuget: API
Exposed support for cross-repository test merges.
/:cl:

🆑 Nuget: Client
Added client support for initiating cross-repository test merges.
/:cl:

Really useful for forks that are really close to their upstream, allows to pull in and use test merges from their upstream PRs that would either need to be manually mirrored or merged in. Mostly a huge QoL change.

tgstation-server-ci · 2026-02-14T14:17:54Z

Thank you for contributing to tgstation-server! The CI Pipeline workflow requires repository secrets and will not run without approval. Maintainers can add the CI Cleared label to allow it to run. Note that any changes to ci-security.yml and ci-pipeline.yml will not be reflected.

Cyberboss

Needs minor version bumps to core, api, api library, and client in build/Version.props.
Needs a changelog entry for REST API, Nuget: Api, and Nuget: Client. Also remove that "Categories" entry you have now.
Needs down migration selection based on previous server version. (The tests are going to complain about this).
Fork https://github.com/Cyberboss/common_core and open a pull request on that fork. Then add tests to RepositoryTest.TestMergeTests.
This is going to need a new RepositoryRights entry (i.e. ForkTestMerges) that needs checking in RepositoryController.cs where test merges are added if TestMergeParameters.SourceRepository is set.

Cyberboss · 2026-02-14T15:35:31Z

+		}
+
+		/// <inheritdoc />
+		public (string owner, string name) GetRepositoryOwnerAndName(TestMergeParameters parameters)


PascalCase for named tuples please

Cyberboss · 2026-02-14T15:38:26Z

-													var numberMatch = testRevInfo.PrimaryTestMerge.Number == testTestMerge.Number;
-													if (!numberMatch)
-														return false;
+												var numberMatch = testRevInfo.PrimaryTestMerge.Number == testTestMerge.Number;


Indentation gone wonky here

Cyberboss · 2026-02-14T15:39:05Z

@@ -0,0 +1,29 @@
+using Microsoft.EntityFrameworkCore.Migrations;


Format with tabs not spaces on all the migration files.

Cyberboss · 2026-02-14T15:47:39Z

The log message should be changed if it's from a separate remote

Cyberboss · 2026-02-14T15:49:40Z

Both these branch names should be changed if a separate remote is in use. Which means IGitRemoteFeatures.TestMergeLocalBranchNameFormatter probably needs changing to a function

Cyberboss · 2026-02-14T15:51:17Z

 							logger.LogTrace("Fetching refspec {refSpec}...", refSpec);

+							var (owner, name) = gitRemoteFeatures.GetRepositoryOwnerAndName(testMergeParameters);
 							var remote = libGitRepo.Network.Remotes.First();


A lot of repository code assumes there is ever only one remote and since we don't know if it's deterministically ordered or not we need to check every place it's used and change it to refer to origin by name.

This one for example is no longer valid after the addition of an extra remote.

Cyberboss · 2026-02-14T15:57:07Z

IGitRemoteFeatures.TestMergeRefSpecFormatter also needs to become a function of source repository

Cyberboss · 2026-02-14T15:58:30Z

 		public int Number { get; set; }

+		/// <summary>
+		/// The source repository of the test merge. If not specified, the repository the server is configured to use will be used.


Suggested change

/// The source repository of the test merge. If not specified, the repository the server is configured to use will be used.

/// The source repository slug of the test merge. If not specified, the repository the server is configured to use will be used.

Cyberboss · 2026-02-14T16:03:00Z

 				.MapMySqlTextField<TestMerge>(x => x.BodyAtMerge)
 				.MapMySqlTextField<TestMerge>(x => x.Comment)
 				.MapMySqlTextField<TestMerge>(x => x.TargetCommitSha)
+				.MapMySqlTextField<TestMerge>(x => x.SourceRepository)


This list is for prior migrations and shouldn't be necessary here. Note that removing it will require you to regenerate the migrations.

Cyberboss · 2026-02-14T16:11:04Z

 				EventType.RepoAddTestMerge,
 				new List<string?>
 				{
 					testMergeParameters.Number.ToString(CultureInfo.InvariantCulture),


An additional parameter should be added to EventType.RepoAddTestMerge with the source repository if it's present. Documentation on the enum will also need updating

…perly

misleadingname · 2026-02-14T22:23:27Z

I really hope I did the changelog thing properly, also it's my first time actually doing a PR like that; so apologies if I did something wrong!

Cyberboss

Sorry, was pretty busy this weekend

Cyberboss · 2026-02-15T06:54:59Z

 				() =>
 				{
-					var remote = libGitRepo.Network.Remotes.First();
+					var remote = libGitRepo.Network.Remotes["origin"];


Make this a class const string please.

it's actually unused so I'll get rid of the instance of this one, you probably meant all of those? Also I don't really get what you mean by making it a const string; as in make the remotes a string and not Remotes?

like

class Repository { const string DefaultRemoteName = "origin"; ...

and then reference that instead of copying "origin" everywhere.

Cyberboss · 2026-02-15T06:57:04Z

 			| RepositoryRights.UpdateBranch
-			| RepositoryRights.ChangeSubmoduleUpdate)]
+			| RepositoryRights.ChangeSubmoduleUpdate
+			| RepositoryRights.OffRepoTestMerges)]


I'd undo this change, OffRepoTestMerges by itself shouldn't grant proper access to this method. The MergePullRequest handles that.

misleadingname · 2026-03-08T13:39:57Z

Excuse the big delay, my primary computer broke and I had to wait for parts to arrive.

misleadingname · 2026-03-23T11:29:17Z

bump

Cyberboss · 2026-03-24T15:01:51Z

Sorry works busy as all hell. Feel free to ping me in Discord after 5PM EST to remind me

…

On Mon, Mar 23, 2026, 7:29 a.m. misname ***@***.***> wrote: *misleadingname* left a comment (tgstation/tgstation-server#2431) <#2431 (comment)> bump — Reply to this email directly, view it on GitHub <#2431?email_source=notifications&email_token=AB6LA6SXQURV3Y63Y7WE3UD4SEN2HA5CNFSNUABFM5UWIORPF5TWS5BNNB2WEL2JONZXKZKDN5WW2ZLOOQXTIMJQHE4TENJTHA4KM4TFMFZW63VGMFZXG2LHN2SWK5TFNZ2KYZTPN52GK4S7MNWGSY3L#issuecomment-4109925388>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AB6LA6SANFYJLQP6XP43MW34SEN2HAVCNFSM6AAAAACVEGNMFKVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHM2DCMBZHEZDKMZYHA> . You are receiving this because you were assigned.Message ID: ***@***.***>

Cyberboss · 2026-03-30T03:27:24Z

Sorry, cleared the tests

Co-authored-by: Jordan Dominion <jordanhcbrown+github@gmail.com>

Allow doing testmerges from different repositories for forks.

25754f3

misleadingname requested a review from Cyberboss as a code owner February 14, 2026 14:17

tgstation-server-ci Bot added size/XXL CI Approval Required CI Pipeline execution blocked. Maintainers, apply the "CI Cleared" label to allow execution labels Feb 14, 2026

misleadingname mentioned this pull request Feb 14, 2026

update webpanel for testmerges from other repositories tgstation/tgstation-server-webpanel#741

Open

Cyberboss requested changes Feb 14, 2026

View reviewed changes

Cyberboss self-assigned this Feb 14, 2026

Cyberboss added this to the v6.20.0 milestone Feb 14, 2026

Cyberboss added Feature New functionality REST The JSON REST API for server control Area: Repository With regard to managing the git repository Migration Requires or performs a database migration CI Cleared Apply this to a pull request from a fork to allow it to run the CI suite labels Feb 14, 2026

tgstation-server-ci Bot removed the CI Approval Required CI Pipeline execution blocked. Maintainers, apply the "CI Cleared" label to allow execution label Feb 14, 2026

Cyberboss requested changes Feb 14, 2026

View reviewed changes

version bumps, fixes here and there; i really hope i'm doing this pro…

6b64e95

…perly

tgstation-server-ci Bot added CI Approval Required CI Pipeline execution blocked. Maintainers, apply the "CI Cleared" label to allow execution and removed CI Cleared Apply this to a pull request from a fork to allow it to run the CI suite labels Feb 14, 2026

oops i forgot to implement the test

1550718

tgstation-server-ci Bot added CI Approval Required CI Pipeline execution blocked. Maintainers, apply the "CI Cleared" label to allow execution and removed CI Approval Required CI Pipeline execution blocked. Maintainers, apply the "CI Cleared" label to allow execution labels Feb 14, 2026

Cyberboss requested changes Feb 17, 2026

View reviewed changes

Cyberboss added the CI Cleared Apply this to a pull request from a fork to allow it to run the CI suite label Feb 17, 2026

tgstation-server-ci Bot removed the CI Approval Required CI Pipeline execution blocked. Maintainers, apply the "CI Cleared" label to allow execution label Feb 17, 2026

undo permissions and remote name

ec08db6

tgstation-server-ci Bot added CI Approval Required CI Pipeline execution blocked. Maintainers, apply the "CI Cleared" label to allow execution and removed CI Cleared Apply this to a pull request from a fork to allow it to run the CI suite labels Mar 9, 2026

Cyberboss added the CI Cleared Apply this to a pull request from a fork to allow it to run the CI suite label Mar 30, 2026

tgstation-server-ci Bot removed the CI Approval Required CI Pipeline execution blocked. Maintainers, apply the "CI Cleared" label to allow execution label Mar 30, 2026

Cyberboss requested changes Apr 11, 2026

View reviewed changes

Comment thread src/Tgstation.Server.Api/Rights/RepositoryRights.cs Outdated

Update src/Tgstation.Server.Api/Rights/RepositoryRights.cs

bdcae22

Co-authored-by: Jordan Dominion <jordanhcbrown+github@gmail.com>

tgstation-server-ci Bot added CI Approval Required CI Pipeline execution blocked. Maintainers, apply the "CI Cleared" label to allow execution and removed CI Cleared Apply this to a pull request from a fork to allow it to run the CI suite labels Apr 13, 2026

Cyberboss added the CI Cleared Apply this to a pull request from a fork to allow it to run the CI suite label Apr 14, 2026

tgstation-server-ci Bot removed the CI Approval Required CI Pipeline execution blocked. Maintainers, apply the "CI Cleared" label to allow execution label Apr 14, 2026

		@@ -0,0 +1,29 @@
		using Microsoft.EntityFrameworkCore.Migrations;

	/// The source repository of the test merge. If not specified, the repository the server is configured to use will be used.
	/// The source repository slug of the test merge. If not specified, the repository the server is configured to use will be used.

Uh oh!

Uh oh!

Conversation

misleadingname commented Feb 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

tgstation-server-ci Bot commented Feb 14, 2026

Uh oh!

Cyberboss left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

misleadingname commented Feb 14, 2026

Uh oh!

Cyberboss left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

misleadingname Mar 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

misleadingname commented Mar 8, 2026

Uh oh!

misleadingname commented Mar 23, 2026

Uh oh!

Cyberboss commented Mar 24, 2026 via email

Uh oh!

Cyberboss commented Mar 30, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

misleadingname commented Feb 14, 2026 •

edited

Loading

misleadingname Mar 8, 2026 •

edited

Loading