diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index f204eb0a72..f9a4055342 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -27,6 +27,11 @@ refactor: refactored some code config: changed some config setting admin: messed with admin stuff server: something server ops should know +wip: still being worked on +experiment: experimental +tgs: has something to do with tgs +expansion: expands on something +qol: quality of life content /:cl: diff --git a/.github/workflows/compile_changelogs.yml b/.github/workflows/compile_changelogs.yml index 0c6974a1d1..fc2f436986 100644 --- a/.github/workflows/compile_changelogs.yml +++ b/.github/workflows/compile_changelogs.yml @@ -43,6 +43,7 @@ jobs: git config --local user.email "action@github.com" git config --local user.name "Changelogs" git pull origin master + git add html/changelogs git commit -m "Automatic changelog compile [ci skip]" -a || true - name: "Push" if: steps.value_holder.outputs.CL_ENABLED diff --git a/html/changelogs/AutoChangeLog-pr-15586.yml b/html/changelogs/AutoChangeLog-pr-15586.yml new file mode 100644 index 0000000000..a121771c26 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15586.yml @@ -0,0 +1,4 @@ +author: "SandPoot" +delete-after: True +changes: + - bugfix: "Make changelogs actually get added!" diff --git a/html/changelogs/example.yml b/html/changelogs/example.yml index b0e660681d..f37fc68f54 100644 --- a/html/changelogs/example.yml +++ b/html/changelogs/example.yml @@ -11,16 +11,16 @@ # - (fixes bugs) # wip # - (work in progress) -# qol -# - (quality of life) +# tweak +# - (tweaks something) # soundadd # - (adds a sound) # sounddel # - (removes a sound) -# rscadd -# - (adds a feature) # rscdel # - (removes a feature) +# rscadd +# - (adds a feature) # imageadd # - (adds an image or sprite) # imagedel @@ -29,6 +29,8 @@ # - (fixes spelling or grammar) # experiment # - (experimental change) +# tgs +# - (messing around with tgs) # balance # - (balance changes) # code_imp @@ -41,6 +43,10 @@ # - (makes changes to administrator tools) # server # - (miscellaneous changes to server) +# expansion +# - (expands something) +# qol +# - (quality of life) ################################# # Your name. diff --git a/tgui/packages/tgui/interfaces/Changelog.js b/tgui/packages/tgui/interfaces/Changelog.js index 56a94fdda7..6e6febb2a8 100644 --- a/tgui/packages/tgui/interfaces/Changelog.js +++ b/tgui/packages/tgui/interfaces/Changelog.js @@ -18,25 +18,24 @@ import yaml from 'js-yaml'; const icons = { bugfix: { icon: 'bug', color: 'green' }, wip: { icon: 'hammer', color: 'orange' }, - qol: { icon: 'hand-holding-heart', color: 'green' }, + tweak: { icon: 'wrench', color: 'green' }, soundadd: { icon: 'tg-sound-plus', color: 'green' }, sounddel: { icon: 'tg-sound-minus', color: 'red' }, - add: { icon: 'check-circle', color: 'green' }, - expansion: { icon: 'check-circle', color: 'green' }, - rscadd: { icon: 'check-circle', color: 'green' }, rscdel: { icon: 'times-circle', color: 'red' }, + rscadd: { icon: 'check-circle', color: 'green' }, imageadd: { icon: 'tg-image-plus', color: 'green' }, imagedel: { icon: 'tg-image-minus', color: 'red' }, spellcheck: { icon: 'spell-check', color: 'green' }, experiment: { icon: 'radiation', color: 'yellow' }, + tgs: { icon: 'toolbox', color: 'purple' }, balance: { icon: 'balance-scale-right', color: 'yellow' }, code_imp: { icon: 'code', color: 'green' }, refactor: { icon: 'tools', color: 'green' }, config: { icon: 'cogs', color: 'purple' }, admin: { icon: 'user-shield', color: 'purple' }, server: { icon: 'server', color: 'purple' }, - tgs: { icon: 'toolbox', color: 'purple' }, - tweak: { icon: 'wrench', color: 'green' }, + expansion: { icon: 'check-circle', color: 'green' }, + qol: { icon: 'hand-holding-heart', color: 'green' }, unknown: { icon: 'info-circle', color: 'label' }, }; diff --git a/tools/WebhookProcessor/github_webhook_processor.php b/tools/WebhookProcessor/github_webhook_processor.php index da7e8445e5..506921487f 100644 --- a/tools/WebhookProcessor/github_webhook_processor.php +++ b/tools/WebhookProcessor/github_webhook_processor.php @@ -832,6 +832,9 @@ function checkchangelog($payload, $compile = true) { $currentchangelogblock[] = array('type' => 'balance', 'body' => $item); } break; + case 'tgs': + $currentchangelogblock[] = array('type' => 'tgs', 'body' => $item); + break; case 'code_imp': case 'code': if($item != 'changed some code'){ diff --git a/tools/ci/check_changelogs.sh b/tools/ci/check_changelogs.sh index d90c93e35b..6bcd3514d4 100755 --- a/tools/ci/check_changelogs.sh +++ b/tools/ci/check_changelogs.sh @@ -1,5 +1,5 @@ #!/bin/bash set -euo pipefail -md5sum -c - <<< "4d783933c74290b3a219068790b2046f *html/changelogs/example.yml" +md5sum -c - <<< "f7e6ca6705adbc0eb85fc381221557c4 *html/changelogs/example.yml" python3 tools/ss13_genchangelog.py html/changelogs diff --git a/tools/ss13_genchangelog.py b/tools/ss13_genchangelog.py index b1f41ed5ae..a83b7ab3ac 100644 --- a/tools/ss13_genchangelog.py +++ b/tools/ss13_genchangelog.py @@ -46,22 +46,24 @@ all_changelog_entries = {} validPrefixes = [ 'bugfix', 'wip', - 'qol', + 'tweak', 'soundadd', 'sounddel', - 'rscadd', 'rscdel', + 'rscadd', 'imageadd', 'imagedel', - 'expansion', 'spellcheck', 'experiment', + 'tgs', 'balance', 'code_imp', 'refactor', 'config', 'admin', - 'server' + 'server', + 'expansion', + 'qol' ] def dictToTuples(inp):