-
Notifications
You must be signed in to change notification settings - Fork 65
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Random things on my todo list, mostly github related (#607)
* Makes the Haunted Eight Ball work(?) (better?) (#78196) From my recollection the haunted eight ball has been "broken" for like 3 or 4 years. So uh... yea Makes the Haunted Eight Ball actually, like, work good. - Fixes all votes counting to 0 - Fixes votes being reported as their vote key and not a flavor message - Allows ghosts to change their vote - General small code cleanup - Calls parent in topic so stat panel clicks work - Fixes #41718 , again? If it was actually ever fixed, not sure :cl: Melbert qol: Haunted 8-ball no longer requires the ghost orbit the petitioner to submit votes qol: Haunted 8-ball ghosts can now change their vote after submitting it fix: Haunted 8-ball no longer always reports "yes" fix: Haunted 8-ball no longer always reports default "yes", "no", or "maybe" and now gives a proper eight ball response fix: Haunted 8-ball can be picked up via the stat panel /:cl: * Replace DreamAnnotate action with a python script (#78225) This PR removes the "Annotate Lints" job step and merges it with the "Run Linters" step above. To achieve this, I wrote a python script that should be identical to the action. I even added the ability to read the output from a file to the script if we ever needed that, but I decided to have the job step pipe the output into the script instead. It always bugged me a bit that we had to check the results for a separate step if we wanted to see the linter results for dm code. I also noticed a few people getting confused as to why their CI failed on linters. Turns out that the action is just a few lines that match the dreamchecker output and reformat it to a format that GitHub can annotate code with. It's so brain dead simple that it shouldn't need to be a whole new step, and for the previous two reasons. not playerfacing * Split Run Linters step into multiple steps (#78265) Splits the big "Run Linters" step into multiple steps. Also since all of these steps are independent of eachother, I've made them all run regardless of if the job is currently failing. <details> <summary>Proof of testing:</summary> Fail in install tools, all linting steps are skipped: https://github.com/distributivgesetz/tgstation/actions/runs/6151628214/job/16692089726 Fail in Run DreamChecker, other steps continue to run: https://github.com/distributivgesetz/tgstation/actions/runs/6151664705/job/16692203569?pr=2 </details> <details> <summary>Pictured: me breaking CI for a day</summary> https://github.com/tgstation/tgstation/assets/47710522/ea12ad30-2b69-4aa3-9642-7d0818eab2d1 </details> Going through the Run Linters step has always been a slog. Finding an error is like finding a needle in a haystack. Seeing what command exactly went wrong is going to go a long way in helping people find out which linters have failed. nothing playerfacing * Fix some odd vscode highlighting errors in workflow files (#78274) few errors which were odd and annoying stealing PRs from san7890, they wanted to do this nothing playerfacing * fuck * fuck 2 --------- Co-authored-by: MrMelbert <[email protected]> Co-authored-by: distributivgesetz <[email protected]>
- Loading branch information
3 people
committed
Sep 16, 2023
1 parent
2dd982e
commit 56b37a6
Showing
8 changed files
with
127 additions
and
45 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| import sys | ||
| import re | ||
| import os.path as path | ||
|
|
||
| # Usage: python3 annotate_dm.py [filename] | ||
| # If filename is not provided, stdin is checked instead | ||
|
|
||
| def red(text): | ||
| return "\033[31m" + str(text) + "\033[0m" | ||
|
|
||
| def green(text): | ||
| return "\033[32m" + str(text) + "\033[0m" | ||
|
|
||
| def yellow(text): | ||
| return "\033[33m" + str(text) + "\033[0m" | ||
|
|
||
| def annotate(raw_output): | ||
| # Remove ANSI escape codes | ||
| raw_output = re.sub(r'(\x9B|\x1B\[)[0-?]*[ -\/]*[@-~]', '', raw_output) | ||
|
|
||
| print("::group::DreamChecker Output") | ||
| print(raw_output) | ||
| print("::endgroup::") | ||
|
|
||
| annotation_regex = r'(?P<filename>.*?), line (?P<line>\d+), column (?P<column>\d+):\s{1,2}(?P<type>error|warning): (?P<message>.*)' | ||
| has_issues = False | ||
|
|
||
| print("DM Code Annotations:") | ||
| for annotation in re.finditer(annotation_regex, raw_output): | ||
| print(f"::{annotation['type']} file={annotation['filename']},line={annotation['line']},col={annotation['column']}::{annotation['message']}") | ||
| has_issues = True | ||
|
|
||
| if not has_issues: | ||
| print(green("No DM issues found")) | ||
|
|
||
| def main(): | ||
| if len(sys.argv) > 1: | ||
| if not path.exists(sys.argv[1]): | ||
| print(red(f"Error: Annotations file '{sys.argv[1]}' does not exist")) | ||
| sys.exit(1) | ||
| with open(sys.argv[1], 'r') as f: | ||
| annotate(f.read()) | ||
| elif not sys.stdin.isatty(): | ||
| annotate(sys.stdin.read()) | ||
| else: | ||
| print(red("Error: No input provided")) | ||
| print("Usage: tools/ci/annotate_dm.sh [filename]") | ||
| sys.exit(1) | ||
|
|
||
| if __name__ == '__main__': | ||
| main() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| #!/bin/bash | ||
|
|
||
| set -euo pipefail | ||
| tools/bootstrap/python tools/ci/annotate_dm.py "$@" |