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

Updates TGS support #2185

Merged
merged 13 commits into from
Aug 1, 2023
Merged

Conversation

MarkSuckerberg
Copy link
Member

@MarkSuckerberg MarkSuckerberg commented Jul 20, 2023

Changelog

🆑 Dominion, Mark Suckerberg
server: We should now support TGS quick setup
admin: The master controller now actually recovers

/:cl:

@MarkSuckerberg MarkSuckerberg requested a review from a team as a code owner July 20, 2023 20:17
@github-actions github-actions bot added DME Edit GitHub Our very own Babylon. Code change Watch something violently break. labels Jul 20, 2023
@MarkSuckerberg
Copy link
Member Author

WOO IT PASSES CHECKS

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Jul 28, 2023
@github-actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

MarkSuckerberg and others added 11 commits July 28, 2023 18:41
- Make names version independent
- Version .yml file (Will I write the code to ever use it, who tf
knows?)
- Add WatchdogLaunch.sh to .yml
- Remove defunct PreSynchronize script.
- Cargo isn't needed in WatchdogLaunch
- Why are we running apt outside of the if?
- grep was only needed for the LinuxOneShot (old tool)
- Bring common code into one file

TODO:
- [x] Test this shit

- Added a test app, ran locally, verified the scripts work, added it to
CI

---------

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: san7890 <the@san7890.com>
- Make names version independent
- Version .yml file (Will I write the code to ever use it, who tf
knows?)
- Add WatchdogLaunch.sh to .yml
- Remove defunct PreSynchronize script.
- Cargo isn't needed in WatchdogLaunch
- Why are we running apt outside of the if?
- grep was only needed for the LinuxOneShot (old tool)
- Bring common code into one file

TODO:
- [x] Test this shit

- Added a test app, ran locally, verified the scripts work, added it to
CI

---------

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: san7890 <the@san7890.com>
Also add test merge support for pull requests
Recent update added a 409 response if two or more configuration accesses
were attempted simultaneously.
@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Jul 28, 2023
@MarkSuckerberg
Copy link
Member Author

fuck it

@MarkSuckerberg MarkSuckerberg added this pull request to the merge queue Aug 1, 2023
Merged via the queue into shiptest-ss13:master with commit 36f3902 Aug 1, 2023
11 checks passed
@MarkSuckerberg MarkSuckerberg deleted the tgs-fixes branch August 1, 2023 22:45
MarkSuckerberg added a commit to MarkSuckerberg/Shiptest that referenced this pull request Aug 11, 2023
## Changelog

:cl: Dominion, Mark Suckerberg
server: We should now support TGS quick setup
admin: The master controller now actually recovers

/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: san7890 <the@san7890.com>
Co-authored-by: Jordan Dominion <Cyberboss@users.noreply.github.com>
MarkSuckerberg pushed a commit to MarkSuckerberg/Shiptest that referenced this pull request Aug 11, 2023
MarkSuckerberg added a commit to MarkSuckerberg/Shiptest that referenced this pull request Sep 13, 2023
## Changelog

:cl: Dominion, Mark Suckerberg
server: We should now support TGS quick setup
admin: The master controller now actually recovers

/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: san7890 <the@san7890.com>
Co-authored-by: Jordan Dominion <Cyberboss@users.noreply.github.com>
MarkSuckerberg pushed a commit to MarkSuckerberg/Shiptest that referenced this pull request Sep 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break. DME Edit GitHub Our very own Babylon.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants