Skip to content

Commit bf2e5c2

Browse files
Merge pull request #44 from FalloutFalcon/darkpack-pull-4-24-26
Darkpack Pull 4/24/2026
2 parents f33ff14 + 2d5f783 commit bf2e5c2

1,335 files changed

Lines changed: 47027 additions & 134550 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/ISSUE_TEMPLATE/bug_report_form.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ body:
5656
label: "Reproduction Steps:"
5757
description: |
5858
Describe the steps to reproduce the issue in detail. Include any relevant information, such as the map, round type, and any other factors that may be relevant.
59-
If it is a runtime-related error, please include the runtime here as that is pertient information. Issues are not for oddities introduced by admin varedits, ensure these occur in normal circumstances.
59+
If it is a runtime-related error, please include the runtime here as that is pertinent information. Issues are not for oddities introduced by admin varedits, ensure these occur in normal circumstances.
6060
placeholder: |
6161
1. Go to the X location
6262
2. Do Y action

.github/actions/restore_or_install_byond/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ runs:
3535
# is cancelled, we already have a cache to restore from.
3636
- name: Restore BYOND cache
3737
id: restore_byond_cache
38-
uses: actions/cache/restore@v4
38+
uses: actions/cache/restore@v5
3939
with:
4040
path: ~/BYOND
4141
key: ${{ runner.os }}-byond-${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }}
@@ -45,7 +45,7 @@ runs:
4545
run: bash tools/ci/install_byond.sh
4646
- name: Save BYOND cache
4747
if: ${{ !steps.restore_byond_cache.outputs.cache-hit }}
48-
uses: actions/cache/save@v4
48+
uses: actions/cache/save@v5
4949
with:
5050
path: ~/BYOND
5151
key: ${{ steps.restore_byond_cache.outputs.cache-primary-key }}

.github/workflows/auto_changelog.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@ jobs:
1818

1919
- name: Generate App Token
2020
id: app-token-generation
21-
uses: actions/create-github-app-token@v3
21+
uses: actions/create-github-app-token@v3.1.1
2222
if: env.APP_PRIVATE_KEY != '' && env.APP_ID != ''
2323
with:
24-
app-id: ${{ secrets.APP_ID }}
24+
client-id: ${{ secrets.APP_ID }}
2525
private-key: ${{ secrets.APP_PRIVATE_KEY }}
2626
env:
2727
APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}
2828
APP_ID: ${{ secrets.APP_ID }}
2929

3030
- name: Run auto changelog
31-
uses: actions/github-script@v7
31+
uses: actions/github-script@v9
3232
with:
3333
script: |
3434
const { processAutoChangelog } = await import('${{ github.workspace }}/tools/pull_request_hooks/autoChangelog.js')

.github/workflows/compile_changelogs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ jobs:
5656
5757
- name: Generate App Token
5858
id: app-token-generation
59-
uses: actions/create-github-app-token@v3
59+
uses: actions/create-github-app-token@v3.1.1
6060
if: env.APP_PRIVATE_KEY != '' && env.APP_ID != ''
6161
with:
62-
app-id: ${{ secrets.APP_ID }}
62+
client-id: ${{ secrets.APP_ID }}
6363
private-key: ${{ secrets.APP_PRIVATE_KEY }}
6464
env:
6565
APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}

.github/workflows/discord_discussions.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,16 @@ jobs:
4141

4242
- name: Generate App Token
4343
id: app-token-generation
44-
uses: getsentry/action-github-app-token@d4b5da6c5e37703f8c3b3e43abb5705b46e159cc
44+
uses: actions/create-github-app-token@v3.1.1
45+
if: env.APP_PRIVATE_KEY != '' && env.APP_ID != ''
4546
with:
46-
app_id: ${{ secrets.APP_ID }}
47-
private_key: ${{ secrets.APP_PRIVATE_KEY }}
47+
client-id: ${{ secrets.APP_ID }}
48+
private-key: ${{ secrets.APP_PRIVATE_KEY }}
49+
env:
50+
APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}
51+
APP_ID: ${{ secrets.APP_ID }}
4852

4953
- name: Run Tgstation.DiscordDiscussions
50-
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 }}
54+
run: dotnet discord_discussions_bins/Tgstation.DiscordDiscussions.dll ${{ steps.app-token-generation.outputs.token || secrets.GITHUB_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 }}
5155
env:
5256
GITHUB_PULL_REQUEST_TITLE: ${{ github.event.pull_request.title }}

.github/workflows/gbp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: Checkout
1515
uses: actions/checkout@v6
1616
- name: Run Auto Labeler
17-
uses: actions/github-script@v7
17+
uses: actions/github-script@v9
1818
with:
1919
script: |
2020
const { get_updated_label_set } = await import('${{ github.workspace }}/tools/pull_request_hooks/autoLabel.js');

.github/workflows/generate_client_storage.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
steps:
1515
- name: Generate App Token
1616
id: app-token-generation
17-
uses: actions/create-github-app-token@v3
17+
uses: actions/create-github-app-token@v3.1.1
1818
if: env.APP_PRIVATE_KEY != '' && env.APP_ID != ''
1919
with:
20-
app-id: ${{ secrets.APP_ID }}
20+
client-id: ${{ secrets.APP_ID }}
2121
private-key: ${{ secrets.APP_PRIVATE_KEY }}
2222
owner: tgstation
2323
env:

.github/workflows/remove_guide_comments.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
- name: Checkout
1212
uses: actions/checkout@v6
1313
- name: Remove guide comments
14-
uses: actions/github-script@v7
14+
uses: actions/github-script@v9
1515
with:
1616
script: |
1717
const { removeGuideComments } = await import('${{ github.workspace }}/tools/pull_request_hooks/removeGuideComments.js')

.github/workflows/rerun_flaky_tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Checkout
1919
uses: actions/checkout@v6
2020
- name: Rerun flaky tests
21-
uses: actions/github-script@v7
21+
uses: actions/github-script@v9
2222
with:
2323
script: |
2424
const { rerunFlakyTests } = await import('${{ github.workspace }}/tools/pull_request_hooks/rerunFlakyTests.js')
@@ -30,7 +30,7 @@ jobs:
3030
- name: Checkout
3131
uses: actions/checkout@v6
3232
- name: Report flaky tests
33-
uses: actions/github-script@v7
33+
uses: actions/github-script@v9
3434
with:
3535
script: |
3636
const { reportFlakyTests } = await import('${{ github.workspace }}/tools/pull_request_hooks/rerunFlakyTests.js')

.github/workflows/run_linters.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
with:
4444
dotnet-version: 9.x
4545
- name: Install OpenDream
46-
uses: robinraju/release-downloader@v1.12
46+
uses: robinraju/release-downloader@93eac224fa5a1e835cc942d66c12ee373bc7fae9
4747
with:
4848
repository: "OpenDreamProject/OpenDream"
4949
tag: "latest"
@@ -91,8 +91,17 @@ jobs:
9191
- name: Run OpenDream
9292
if: steps.linter-setup.conclusion == 'success' && !cancelled()
9393
run: ./DMCompiler_linux-x64/DMCompiler tgstation.dme --suppress-unimplemented --define=CIBUILDING | bash tools/ci/annotate_od.sh
94+
- name: Check for Map & Maplint File Edits
95+
id: map-filter
96+
uses: dorny/paths-filter@v4
97+
with:
98+
filters: |
99+
run_maps:
100+
- '**.dmm'
101+
- 'tools/maplint/**'
102+
- 'tools/mapmerge2/**'
94103
- name: Run Map Checks
95-
if: steps.linter-setup.conclusion == 'success' && !cancelled()
104+
if: steps.linter-setup.conclusion == 'success' && !cancelled() && steps.map-filter.outputs.run_maps == 'true'
96105
run: |
97106
tools/bootstrap/python -m mapmerge2.dmm_test
98107
tools/bootstrap/python -m tools.maplint.source

0 commit comments

Comments
 (0)