diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 0355ff343fa..d269cbc10ca 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -5,222 +5,9 @@ # to the same file or dir, add them to the end of under Multiple Owners # MAINTAINERS +/.github/ @lessthnthree +/config/ @lessthnthree @unit0016 +/local/ @lessthnthree @unit0016 +/tgui/ @lessthnthree -# Dominion/Cyberboss - -/.github/workflows/update_tgs_dmapi.yml @Cyberboss -/.tgs.yml @Cyberboss -/code/world.dm @Cyberboss -/code/__DEFINES/tgs.config.dm @Cyberboss -/code/__DEFINES/tgs.dm @Cyberboss -/code/__DEFINES/_globals.dm @Cyberboss -/code/__HELPERS/chat.dm @Cyberboss -/code/__HELPERS/jatum.dm @Cyberboss -/code/game/world.dm @Cyberboss -/code/controllers/subsystem/atoms.dm @Cyberboss -/code/controllers/globals.dm @Cyberboss -/code/datums/helper_datums/getrev.dm @Cyberboss -/code/modules/tgs/ @Cyberboss -/code/ze_genesis_call/ @Cyberboss -/tools/tgs_test/ @Cyberboss - -# Cobby - -/code/modules/reagents/ @ExcessiveUseOfCobblestone -/code/modules/research/designs/medical_designs.dm @ExcessiveUseOfCobblestone -/code/game/objects/items/storage/medkit.dm @ExcessiveUseOfCobblestone - -# Fikou - -/code/modules/awaymissions/ @Fikou -/code/modules/mining/ @Fikou -/code/modules/mod/ @Fikou -/code/modules/mapfluff/ruins/lavalandruin_code/ @Fikou -/code/modules/mapfluff/ruins/lavaland_ruin_code.dm @Fikou - -# JohnFulpWizard - -/code/modules/mob/living/simple_animal/bot/ @JohnFulpWillard -/code/modules/modular_computers/ @JohnFulpWillard - -# Kylerace - -/code/__DEFINES/spatial_gridmap.dm @Kylerace -/code/controllers/subsystem/spatial_gridmap.dm @Kylerace - -# LemonInTheDark - -/.github/guides/VISUALS.md @LemonInTheDark -/code/_onclick/hud/ @LemonInTheDark -/code/__DEFINES/layers.dm @LemonInTheDark -/code/__DEFINES/MC.dm @LemonInTheDark -/code/controllers/admin.dm @LemonInTheDark -/code/controllers/failsafe.dm @LemonInTheDark -/code/controllers/master.dm @LemonInTheDark -/code/controllers/subsystem.dm @LemonInTheDark -/code/controllers/subsystem/air.dm @LemonInTheDark -/code/controllers/subsystem/timer.dm @LemonInTheDark - -# Mothblocks - -/.github/workflows/ @Mothblocks -/code/game/gamemodes/ @Mothblocks -/code/modules/autowiki/ @Mothblocks -/code/modules/unit_tests/ @Mothblocks -/code/modules/client/preferences/ @Mothblocks -/code/modules/client/preferences_menu.dm @Mothblocks -/tgui/packages/tgui/interfaces/PreferencesMenu/ @Mothblocks -/tools/ezdb/ @Mothblocks -/tools/maplint/source/ @Mothblocks -/tools/pull_request_hooks/ @Mothblocks -/tools/screenshot-test-comparison/ @Mothblocks -/tools/test_merge_bot/ @Mothblocks - -# MrMelbert - -/code/modules/hydroponics/ @MrMelbert - -# ninjanomnom - -/code/controllers/subsystem/dcs.dm @ninjanomnom -/code/datums/signals.dm @ninjanomnom -/code/datums/components/_component.dm @ninjanomnom -/code/datums/elements/_element.dm @ninjanomnom -/code/datums/greyscale/_greyscale_config.dm @ninjanomnom -/code/datums/greyscale/json_reader.dm @ninjanomnom -/code/datums/greyscale/layer.dm @ninjanomnom - -# Ryll-Ryll/Shaps - -/code/datums/wounds/ @Ryll-Ryll -/code/datums/status_effects/wound_effects.dm @Ryll-Ryll -/code/__DEFINES/wounds.dm @Ryll-Ryll - -# san7890 - -/code/game/area/ @san7890 -/icons/area/ @san7890 - -# SmArtKar - -/code/modules/projectiles/projectile.dm @SmArtKar - -# stylemistake - -/code/__DEFINES/chat.dm @stylemistake -/code/__DEFINES/tgui.dm @stylemistake -/code/controllers/subsystem/chat.dm @stylemistake -/code/controllers/subsystem/ping.dm @stylemistake -/code/controllers/subsystem/tgui.dm @stylemistake -/code/modules/tgchat/ @stylemistake -/code/modules/tgui/ @stylemistake -/code/modules/tgui_panel/ @stylemistake -/tgui/ @stylemistake - -# stylemistake (explicitly disowned) - -/tgui/packages/tgui/interfaces/ -/tgui/packages/tgui/styles/interfaces/ -/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss -/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss - -# SuperNovaa41 - -/code/modules/forensics/ @SuperNovaa41 -/code/datums/mood.dm @SuperNovaa41 - -# Time-Green - -/code/modules/plumbing/ @Time-Green -/code/modules/surgery/organs/external/ @Time-Green - -# tralezab -/code/__DEFINES/basic_mobs.dm @tralezab -/code/datums/ai/ @tralezab -/code/modules/religion/ @tralezab - -# Watermelon914 - -/code/modules/wiremod/ @Watermelon914 -/code/modules/antagonists/traitor/ @Watermelon914 -/code/controllers/subsystem/tts.dm @Watermelon914 - -# ZephyrTFA - -/code/__HELPERS/admin_verb.dm @ZephyrTFA -/code/controllers/subsystem/admin_verbs.dm @ZephyrTFA -/code/datums/json_savefile.dm @ZephyrTFA -/code/datums/armor/ @ZephyrTFA -/code/modules/admin/verbs/ @ZephyrTFA -/code/modules/logging/ @ZephyrTFA -/tools/ci/check_grep.sh @ZephyrTFA - - -# CONTRIBUTORS - -# Jordie0608 - -/code/controllers/subsystem/dbcore.dm @Jordie0608 -/tools/SQLAlertEmail/ @Jordie0608 - -# Kapu1178 - -/code/modules/surgery/bodyparts/ @Kapu1178 -/code/modules/surgery/organs/ @Kapu1178 -/code/modules/mob/living/carbon/carbon_update_icons.dm @Kapu1178 -/code/modules/mob/living/carbon/human/human_update_icons.dm @Kapu1178 - -# NamelessFairy - -/code/modules/capture_the_flag/ @NamelessFairy -/_maps/map_files/CTF/ @NamelessFairy - -# Pickle-Coding - -/code/__DEFINES/atmospherics/ @Pickle-Coding -/code/__DEFINES/reactions.dm @Pickle-Coding -/code/modules/atmospherics/ @Pickle-Coding -/code/modules/power/ @Pickle-Coding - -# MULTIPLE OWNERS - -/SQL/ @Jordie0608 @scriptis - -/_maps/ @EOBGames @Maurukas @MMMiracles @san7890 @ShizCalev - -/icons/ @Imaginos16 @Krysonism @Twaticus @Wallemations - -/code/__DEFINES/atmospherics/ @Ghilker @LemonInTheDark - -/code/__HELPERS/logging/ @dragomagol @ZephyrTFA - -/code/modules/atmospherics/ @Ghilker @LemonInTheDark - -/code/modules/client/preferences.dm @Mothblocks @ZephyrTFA -/code/modules/client/preferences_savefile.dm @Mothblocks @ZephyrTFA - -/code/modules/jobs/job_types/chief_medical_officer.dm @ExcessiveUseOfCobblestone @Ryll-Ryll -/code/modules/jobs/job_types/medical_doctor.dm @ExcessiveUseOfCobblestone @Ryll-Ryll -/code/modules/jobs/job_types/paramedic.dm @ExcessiveUseOfCobblestone @Ryll-Ryll - -/code/modules/mob/living/basic/ @Jacquerel @san7890 @tralezab - -/code/modules/surgery/ @ExcessiveUseOfCobblestone @Ryll-Ryll - -/tools/build/ @scriptis @stylemistake -/tools/tgs_scripts/ @Cyberboss @scriptis - -/tools/WebhookProcessor/ @BraveMole @TiviPlus - -# Host Hell - -/code/controllers/configuration/entries @scriptis -/config/ @scriptis - -# Expensive files that touching basically always cause performance problems -## Init times -**/*_EXPENSIVE.dm @Mothblocks @LemonInTheDark - -# SIC SEMPER TYRANNIS - -/code/modules/hydroponics/grown/citrus.dm @LemonInTheDark @optimumtact +/_maps/ @unit0016 diff --git a/.github/alternate_byond_versions.txt b/.github/alternate_byond_versions.txt index 6f646a115f5..d9ae3b72c12 100644 --- a/.github/alternate_byond_versions.txt +++ b/.github/alternate_byond_versions.txt @@ -6,7 +6,5 @@ # Example: # 500.1337: runtimestation # 516.1638: runtimestation;516 -# Lowest supported version -515.1642: runtimestation # Beta version -516.1648: runtimestation;516 +516.1655: runtimestation;516 diff --git a/.github/workflows/auto_changelog.yml b/.github/workflows/auto_changelog.yml index 45303ec0c92..e2265b0f50e 100644 --- a/.github/workflows/auto_changelog.yml +++ b/.github/workflows/auto_changelog.yml @@ -5,7 +5,7 @@ on: types: - closed branches: - - master + - main permissions: contents: write jobs: diff --git a/.github/workflows/autowiki.yml b/.github/workflows/autowiki.yml deleted file mode 100644 index 5e10274a719..00000000000 --- a/.github/workflows/autowiki.yml +++ /dev/null @@ -1,45 +0,0 @@ -name: Autowiki -on: - schedule: - - cron: "5 4 * * *" - workflow_dispatch: -permissions: - contents: read - -jobs: - autowiki: - runs-on: ubuntu-latest - steps: - - name: "Check for AUTOWIKI_USERNAME" - id: secrets_set - env: - ENABLER_SECRET: ${{ secrets.AUTOWIKI_USERNAME }} - run: | - unset SECRET_EXISTS - if [ -n "$ENABLER_SECRET" ]; then SECRET_EXISTS=true ; fi - echo "SECRETS_ENABLED=$SECRET_EXISTS" >> $GITHUB_OUTPUT - - name: Checkout - if: steps.secrets_set.outputs.SECRETS_ENABLED - uses: actions/checkout@v4 - - name: Install BYOND - if: steps.secrets_set.outputs.SECRETS_ENABLED - uses: ./.github/actions/restore_or_install_byond - - name: Install rust-g - if: steps.secrets_set.outputs.SECRETS_ENABLED - run: | - bash tools/ci/install_rust_g.sh - - name: Compile and generate Autowiki files - if: steps.secrets_set.outputs.SECRETS_ENABLED - run: | - source $HOME/BYOND/byond/bin/byondsetup - tools/build/build --ci autowiki - - name: Run Autowiki - if: steps.secrets_set.outputs.SECRETS_ENABLED - env: - USERNAME: ${{ secrets.AUTOWIKI_USERNAME }} - PASSWORD: ${{ secrets.AUTOWIKI_PASSWORD }} - run: | - cd tools/autowiki - npm install - cd ../.. - node tools/autowiki/autowiki.js data/autowiki_edits.txt data/autowiki_files/ diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml index 708f0fda602..f49c8ac0dfc 100644 --- a/.github/workflows/ci_suite.yml +++ b/.github/workflows/ci_suite.yml @@ -2,17 +2,17 @@ name: CI Suite on: push: branches: - - master + - main - 'project/**' - 'gh-readonly-queue/master/**' - 'gh-readonly-queue/project/**' pull_request: branches: - - master + - main - 'project/**' merge_group: branches: - - master + - main concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/compile_changelogs.yml b/.github/workflows/compile_changelogs.yml index aaf01306a80..f166f6ab5e1 100644 --- a/.github/workflows/compile_changelogs.yml +++ b/.github/workflows/compile_changelogs.yml @@ -2,7 +2,7 @@ name: Compile changelogs on: schedule: - - cron: "0 0 * * *" + - cron: "2 23 * * *" workflow_dispatch: jobs: @@ -51,23 +51,11 @@ jobs: run: | git config --local user.name "tgstation-ci[bot]" git config --local user.email "179393467+tgstation-ci[bot]@users.noreply.github.com" - git pull origin master + git pull origin main git add html/changelogs - git commit -m "Automatic changelog compile [ci skip]" -a || true - - - name: Generate App Token - id: app-token-generation - uses: actions/create-github-app-token@v1 - if: env.APP_PRIVATE_KEY != '' && env.APP_ID != '' - with: - app-id: ${{ secrets.APP_ID }} - private-key: ${{ secrets.APP_PRIVATE_KEY }} - env: - APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }} - APP_ID: ${{ secrets.APP_ID }} - + git commit -m "Effigy automatic changelog compile [ci skip]" -a || true - name: "Push" if: steps.value_holder.outputs.ACTIONS_ENABLED uses: ad-m/github-push-action@master with: - github_token: ${{ steps.app-token-generation.outputs.token || secrets.GITHUB_TOKEN }} + github_token: ${{ secrets.SKYYNET_PAT || secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/discord_discussions.yml b/.github/workflows/discord_discussions.yml deleted file mode 100644 index 439315cbb95..00000000000 --- a/.github/workflows/discord_discussions.yml +++ /dev/null @@ -1,52 +0,0 @@ -name: Discord Discussions - -on: - pull_request_target: - types: - - opened - - reopened - - edited - - labeled - - closed - branches: - - master - -concurrency: - group: "discord-discussions-${{ github.head_ref }}" - cancel-in-progress: true - -jobs: - manage-discord-discussion: - name: Manage Discord Discussion - runs-on: ubuntu-latest - if: contains(github.event.pull_request.labels.*.name, 'Discord Discussion') - steps: - - name: Fail if vars.DISCORD_DISCUSSIONS_CHANNEL_ID is unset - if: ${{ vars.DISCORD_DISCUSSIONS_CHANNEL_ID == '' }} - run: | - echo "vars.DISCORD_DISCUSSIONS_CHANNEL_ID (${{ vars.DISCORD_DISCUSSIONS_CHANNEL_ID }}) must be set to use this label!" - exit 1 - - - name: Setup dotnet - uses: actions/setup-dotnet@v4 - with: - dotnet-version: 8.0.x - dotnet-quality: ga - - - name: Checkout - uses: actions/checkout@v4 - - - name: Build Tgstation.DiscordDiscussions - run: dotnet publish -c Release -o discord_discussions_bins tools/Tgstation.DiscordDiscussions/Tgstation.DiscordDiscussions.csproj - - - name: Generate App Token - id: app-token-generation - uses: getsentry/action-github-app-token@d4b5da6c5e37703f8c3b3e43abb5705b46e159cc - with: - app_id: ${{ secrets.APP_ID }} - private_key: ${{ secrets.APP_PRIVATE_KEY }} - - - name: Run Tgstation.DiscordDiscussions - run: dotnet discord_discussions_bins/Tgstation.DiscordDiscussions.dll ${{ steps.app-token-generation.outputs.token }} ${{ github.repository_owner }} ${{ github.event.repository.name }} ${{ github.event.pull_request.number }} ${{ github.event.pull_request.merged && 'merged' || github.event.pull_request.state }} ${{ secrets.DISCORD_DISCUSSIONS_TOKEN }} ${{ vars.DISCORD_DISCUSSIONS_CHANNEL_ID }} ${{ github.event.action == 'reopened' && 'true' || 'false' }} ${{ vars.DISCORD_JOIN_LINK }} - env: - GITHUB_PULL_REQUEST_TITLE: ${{ github.event.pull_request.title }} diff --git a/.github/workflows/docker_publish.yml b/.github/workflows/docker_publish.yml deleted file mode 100644 index 6daec1ded10..00000000000 --- a/.github/workflows/docker_publish.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: Docker Build -on: - schedule: - - cron: "19 1 * * *" - workflow_dispatch: -jobs: - publish: - if: ( !contains(github.event.head_commit.message, '[ci skip]') ) - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v4 - - - name: Build and Publish Docker Image to Registry - uses: elgohr/Publish-Docker-Github-Action@v5 - with: - name: tgstation/tgstation - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - dockerfile: Dockerfile - tags: "latest" diff --git a/.github/workflows/gbp.yml b/.github/workflows/gbp.yml deleted file mode 100644 index face7b8f3d0..00000000000 --- a/.github/workflows/gbp.yml +++ /dev/null @@ -1,66 +0,0 @@ -name: Label and GBP -on: - pull_request_target: - types: [closed, opened, synchronize] -jobs: - # labeler must run before gbp because gbp calculates itself based on labels - labeler: - runs-on: ubuntu-latest - if: github.event.action == 'opened' || github.event.action == 'synchronize' - permissions: - pull-requests: write # to apply labels - issues: write # to apply labels - steps: - - name: Checkout - uses: actions/checkout@v4 - - name: Run Auto Labeler - uses: actions/github-script@v7 - with: - script: | - const { get_updated_label_set } = await import('${{ github.workspace }}/tools/pull_request_hooks/autoLabel.js'); - const new_labels = await get_updated_label_set({ github, context }); - github.rest.issues.setLabels({ - issue_number: context.issue.number, - owner: context.repo.owner, - repo: context.repo.repo, - labels: new_labels, - }); - console.log(`Labels updated: ${new_labels}`); - gbp: - runs-on: ubuntu-latest - if: github.event.action == 'opened' || github.event.action == 'closed' - steps: - - name: "Check for ACTION_ENABLER secret and pass true to output if it exists to be checked by later steps" - id: value_holder - env: - ENABLER_SECRET: ${{ secrets.ACTION_ENABLER }} - run: | - unset SECRET_EXISTS - if [ -n "$ENABLER_SECRET" ]; then SECRET_EXISTS=true ; fi - echo "ACTIONS_ENABLED=$SECRET_EXISTS" >> $GITHUB_OUTPUT - - name: Checkout - if: steps.value_holder.outputs.ACTIONS_ENABLED - uses: actions/checkout@v4 - - name: Setup git - if: steps.value_holder.outputs.ACTIONS_ENABLED - run: | - git config --global user.name "gbp-action" - git config --global user.email "<>" - - name: Checkout alternate branch - if: steps.value_holder.outputs.ACTIONS_ENABLED - uses: actions/checkout@v4 - with: - ref: "gbp-balances" # The branch name - path: gbp-balances - # This is to ensure we keep the gbp.toml from master - # without having to update our separate branch. - - name: Copy configuration - if: steps.value_holder.outputs.ACTIONS_ENABLED - run: cp ./.github/gbp.toml ./gbp-balances/.github/gbp.toml - - name: GBP action - if: steps.value_holder.outputs.ACTIONS_ENABLED - uses: tgstation/gbp-action@master - with: - branch: "gbp-balances" - directory: ./gbp-balances - token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/gbp_collect.yml b/.github/workflows/gbp_collect.yml deleted file mode 100644 index 4dd327abecd..00000000000 --- a/.github/workflows/gbp_collect.yml +++ /dev/null @@ -1,44 +0,0 @@ -name: GBP Collection -# Every hour at the :20 minute mark. GitHub tells us to pick odd hours, instead of just using the start. -on: - schedule: - - cron: "20 * * * *" - workflow_dispatch: -jobs: - gbp_collection: - runs-on: ubuntu-latest - steps: - - name: "Check for ACTION_ENABLER secret and pass true to output if it exists to be checked by later steps" - id: value_holder - env: - ENABLER_SECRET: ${{ secrets.ACTION_ENABLER }} - run: | - unset SECRET_EXISTS - if [ -n "$ENABLER_SECRET" ]; then SECRET_EXISTS=true ; fi - echo "ACTIONS_ENABLED=$SECRET_EXISTS" >> $GITHUB_OUTPUT - - name: Checkout - if: steps.value_holder.outputs.ACTIONS_ENABLED - uses: actions/checkout@v4 - - name: Setup git - if: steps.value_holder.outputs.ACTIONS_ENABLED - run: | - git config --global user.name "github-actions[bot]" - git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com" - - name: Checkout alternate branch - if: steps.value_holder.outputs.ACTIONS_ENABLED - uses: actions/checkout@v4 - with: - ref: "gbp-balances" # The branch name - path: gbp-balances - # This is to ensure we keep the gbp.toml from master - # without having to update our separate branch. - - name: Copy configuration - if: steps.value_holder.outputs.ACTIONS_ENABLED - run: cp ./.github/gbp.toml ./gbp-balances/.github/gbp.toml - - name: GBP action - if: steps.value_holder.outputs.ACTIONS_ENABLED - uses: tgstation/gbp-action@master - with: - collect: "true" - directory: ./gbp-balances - token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/generate_documentation.yml b/.github/workflows/generate_documentation.yml deleted file mode 100644 index 423c7f10ad6..00000000000 --- a/.github/workflows/generate_documentation.yml +++ /dev/null @@ -1,35 +0,0 @@ -name: Generate documentation -on: - schedule: - - cron: "44 */6 * * *" - workflow_dispatch: -permissions: - contents: read -jobs: - generate_documentation: - permissions: - contents: write # for JamesIves/github-pages-deploy-action to push changes in repo - if: ( !contains(github.event.head_commit.message, '[ci skip]') ) - runs-on: ubuntu-22.04 - concurrency: gen-docs - steps: - - uses: actions/checkout@v4 - - name: Setup cache - uses: actions/cache@v4 - with: - path: ~/SpacemanDMM - key: ${{ runner.os }}-spacemandmm-${{ secrets.CACHE_PURGE_KEY }} - - name: Install SpacemanDMM - run: bash tools/ci/install_spaceman_dmm.sh dmdoc - - name: Generate documentation - run: | - ~/dmdoc - touch dmdoc/.nojekyll - echo codedocs.tgstation13.org > dmdoc/CNAME - - name: Deploy - uses: JamesIves/github-pages-deploy-action@v4.7.2 - with: - branch: gh-pages - clean: true - single-commit: true - folder: dmdoc diff --git a/.github/workflows/round_id_linker.yml b/.github/workflows/round_id_linker.yml deleted file mode 100644 index fb4a202d179..00000000000 --- a/.github/workflows/round_id_linker.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: "Round ID Linker" -on: - issues: - types: [opened] - -jobs: - link_rounds: - runs-on: ubuntu-22.04 - steps: - - uses: tgstation/round_linker@master - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 1b268802227..d4645558307 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -2,7 +2,7 @@ name: Mark stale issues and pull requests on: schedule: - - cron: "0 0 * * *" + - cron: "7 23 * * *" permissions: contents: read diff --git a/.github/workflows/test_merge_bot.yml b/.github/workflows/test_merge_bot.yml deleted file mode 100644 index 76dcd3cabc5..00000000000 --- a/.github/workflows/test_merge_bot.yml +++ /dev/null @@ -1,41 +0,0 @@ -# On a cron, will comment on any PRs that have been test merged. -# Expects secret GET_TEST_MERGES_URL, a URL that, on GET, will return an array of objects with the schema -# { round_id, datetime, test_merges, server, url } -# You can see the moth.fans implementation in Rust here: https://github.com/Mothblocks/mothbus/blob/41fec056824edba0ffdfa39882b67739bf475d83/src/routes/recent_test_merges.rs#L30 -# This is hosted on https://bus.moth.fans/recent-test-merges.json. -name: Test Merge Detector -on: - schedule: - - cron: "*/30 * * * *" - workflow_dispatch: -jobs: - test_merge_bot: - name: Test Merge Detector - runs-on: ubuntu-22.04 - steps: - - name: Check for GET_TEST_MERGES_URL - id: secrets_set - env: - ENABLER_SECRET: ${{ secrets.GET_TEST_MERGES_URL }} - run: | - unset SECRET_EXISTS - if [ -n "$ENABLER_SECRET" ]; then SECRET_EXISTS=true ; fi - echo "GET_TEST_MERGES_URL=$SECRET_EXISTS" >> $GITHUB_OUTPUT - - name: Checkout - if: steps.secrets_set.outputs.GET_TEST_MERGES_URL - uses: actions/checkout@v4 - - name: Prepare module - if: steps.secrets_set.outputs.GET_TEST_MERGES_URL - run: | - # This is needed because node-fetch needs import and doesn't work with require :/ - echo "{\"type\": \"module\"}" > package.json - npm install node-fetch - - name: Check for test merges - if: steps.secrets_set.outputs.GET_TEST_MERGES_URL - uses: actions/github-script@v7 - env: - GET_TEST_MERGES_URL: ${{ secrets.GET_TEST_MERGES_URL }} - with: - script: | - const { processTestMerges } = await import('${{ github.workspace }}/tools/test_merge_bot/main.js') - await processTestMerges({ github, context }) diff --git a/.github/workflows/tgs_test.yml b/.github/workflows/tgs_test.yml index 4b7853aa77c..756ab82e542 100644 --- a/.github/workflows/tgs_test.yml +++ b/.github/workflows/tgs_test.yml @@ -2,9 +2,9 @@ name: TGS Test Suite on: push: branches: - - master + - main - 'project/**' - - 'gh-readonly-queue/master/**' + - 'gh-readonly-queue/main/**' - 'gh-readonly-queue/project/**' paths: - '.tgs.yml' @@ -19,7 +19,7 @@ on: - 'tools/tgs_test/**' pull_request: branches: - - master + - main - 'project/**' paths: - '.tgs.yml' @@ -34,7 +34,7 @@ on: - 'tools/tgs_test/**' merge_group: branches: - - master + - main env: TGS_API_PORT: 5000 PR_NUMBER: ${{ github.event.number }} diff --git a/.github/workflows/update_tgs_dmapi.yml b/.github/workflows/update_tgs_dmapi.yml index 3f7ee320d90..ff689256b6b 100644 --- a/.github/workflows/update_tgs_dmapi.yml +++ b/.github/workflows/update_tgs_dmapi.yml @@ -2,7 +2,7 @@ name: Update TGS DMAPI on: schedule: - - cron: "0 0 * * *" + - cron: "14 23 * * *" workflow_dispatch: jobs: @@ -20,7 +20,7 @@ jobs: run: | git branch -f tgs-dmapi-update git checkout tgs-dmapi-update - git reset --hard master + git reset --hard main - name: Apply DMAPI update uses: tgstation/tgs-dmapi-updater@v2 @@ -38,17 +38,6 @@ jobs: git commit -m 'Update TGS DMAPI' git push -f -u origin tgs-dmapi-update - - name: Generate App Token - id: app-token-generation - uses: actions/create-github-app-token@v1 - if: env.APP_PRIVATE_KEY != '' && env.APP_ID != '' - with: - app-id: ${{ secrets.APP_ID }} - private-key: ${{ secrets.APP_PRIVATE_KEY }} - env: - APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }} - APP_ID: ${{ secrets.APP_ID }} - - name: Create Pull Request uses: repo-sync/pull-request@v2 if: ${{ success() }} @@ -59,4 +48,4 @@ jobs: pr_body: "This pull request updates the TGS DMAPI to the latest version. Please note any changes that may be breaking or unimplemented in your codebase by checking what changes are in the definitions file: code/__DEFINES/tgs.dm before merging.\n\n${{ steps.dmapi-update.outputs.release-notes }}" pr_label: "Tools" pr_allow_empty: false - github_token: ${{ steps.app-token-generation.outputs.token || secrets.GITHUB_TOKEN }} + github_token: ${{ secrets.SKYYNET_PAT }} diff --git a/_maps/birdshot.json b/_maps/birdshot.json deleted file mode 100644 index 659db9390f7..00000000000 --- a/_maps/birdshot.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "version": 1, - "map_name": "Birdshot Station", - "map_path": "map_files/Birdshot", - "map_file": "birdshot.dmm", - "shuttles": { - "cargo": "cargo_birdshot", - "ferry": "ferry_kilo", - "whiteship": "whiteship_birdshot", - "emergency": "emergency_birdshot" - }, - "job_changes": { - "Cook": { - "additional_cqc_areas": ["/area/station/service/bar", "/area/station/commons/lounge"] - } - } -} diff --git a/_maps/deltastation.json b/_maps/deltastation.json deleted file mode 100644 index d21ee4eac73..00000000000 --- a/_maps/deltastation.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "version": 1, - "map_name": "Delta Station", - "map_path": "map_files/Deltastation", - "map_file": "DeltaStation2.dmm", - "shuttles": { - "emergency": "emergency_delta", - "ferry": "ferry_fancy", - "cargo": "cargo_delta", - "whiteship": "whiteship_delta" - }, - "job_changes": { - "Cook": { - "additional_cqc_areas": ["/area/station/service/cafeteria"] - } - } -} diff --git a/_maps/nebulastation.json b/_maps/nebulastation.json deleted file mode 100644 index dade4f7187b..00000000000 --- a/_maps/nebulastation.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "version": 1, - "map_name": "NebulaStation", - "map_path": "map_files/NebulaStation", - "map_file": "NebulaStation.dmm", - "shuttles": { - "cargo": "cargo_nebula", - "ferry": "ferry_nebula", - "whiteship": "whiteship_tram", - "emergency": "emergency_nebula" - }, - "traits": [ - { - "Up": true, - "Linkage": "Cross" - }, - { - "Down": true, - "Baseturf": "/turf/open/openspace", - "Linkage": "Cross" - } - ] -} diff --git a/_maps/wawastation.json b/_maps/wawastation.json deleted file mode 100644 index 71c818bc6bd..00000000000 --- a/_maps/wawastation.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "version": 1, - "map_name": "Wawastation", - "map_path": "map_files/wawastation", - "map_file": "wawastation.dmm", - "shuttles": { - "cargo": "cargo_box", - "ferry": "ferry_fancy", - "whiteship": "whiteship_meta", - "emergency": "emergency_wawa" - }, - "traits": [ - { - "Baseturf": "/turf/open/misc/asteroid/airless", - "Linkage": "Cross" - }, - { - "Baseturf": "/turf/open/openspace", - "Linkage": "Cross" - } - ], - "job_changes": { - "Cook": { - "additional_cqc_areas": ["/area/station/service/bar", "/area/station/commons/lounge"] - }, - "Captain": { - "special_charter": "asteroid" - } - } -}