Skip to content
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.

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

TRX merger #1553

Merged
merged 11 commits into from
Oct 3, 2024
Merged

TRX merger #1553

merged 11 commits into from
Oct 3, 2024

Conversation

rr-
Copy link
Collaborator

@rr- rr- commented Oct 2, 2024

Checklist

  • I have read the coding conventions
  • I have added a changelog entry about what my pull request accomplishes, or it is an internal change

Description

Merges TRX and libtrx into a single repository. Doesn't preserve the commit history, which we regarded as an acceptable loss.

Remaining to be done after the merge:

  • Rename the repository
  • Adjust GitHub labels
  • Adjust GitHub milestones
  • Rename git tags
  • Adjust GitHub releases to use the new tags
  • Transfer TR2X issues
  • Correct TR2X ticket numbers to the transferred ones in the changelog
  • Fix all links LostArtefacts/TR1X and LostArtefacts/TR2X links in the docs

@rr- rr- added Internal The invisible stuff Priority: high labels Oct 2, 2024
@rr- rr- added this to the 4.5 milestone Oct 2, 2024
@rr- rr- self-assigned this Oct 2, 2024
@rr- rr- requested review from a team as code owners October 2, 2024 08:35
@rr- rr- requested review from lahm86, walkawayy and aredfan and removed request for a team October 2, 2024 08:35
Copy link
Collaborator

@walkawayy walkawayy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great and works great! Amazing. I just had to delete my old Docker containers and run a just clean.

Only minor things I noticed:

  1. just alone only builds TR1X. I guess that's an ok default to have?
  2. docs/tr1/CONTRIBUTING.md and docs/tr2/CONTRIBUTING.md should probably be slightly updated to explicitly mention just-tr1-... and just-tr2-....
  3. I don't fully understand how just lint etc work now. Does the command lint both TR1X and TR2X? The CONTRIBUTING.md could also maybe reflect this answer too.

@rr-
Copy link
Collaborator Author

rr- commented Oct 3, 2024

Looks great and works great! Amazing. I just had to delete my old Docker containers and run a just clean.

Only minor things I noticed:

  1. just alone only builds TR1X. I guess that's an ok default to have?

Thanks, changed this to also build TR2.

  1. docs/tr1/CONTRIBUTING.md and docs/tr2/CONTRIBUTING.md should probably be slightly updated to explicitly mention just-tr1-... and just-tr2-....

Actually these two documents got merged to docs/CONTRIBUTING.md since they were mostly identical.

  1. I don't fully understand how just lint etc work now. Does the command lint both TR1X and TR2X? The CONTRIBUTING.md could also maybe reflect this answer too.

Correct – it formats all the code. Similarly autogenerated code is updated on each pre-commit trigger.

@rr- rr- merged commit 38a44b3 into LostArtefacts:develop Oct 3, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Internal The invisible stuff TR1 TR2
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

4 participants