Skip to content

Commit 8650e20

Browse files
authored
Merge pull request #151 from Alliance-codeBase/upstream
Upstream 2026-06-24
2 parents cdcc1fc + 6dc8428 commit 8650e20

238 files changed

Lines changed: 8684 additions & 8799 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/workflows/auto_changelog.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
if: github.event.pull_request.merged == true
1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@v6
17+
uses: actions/checkout@v7
1818

1919
- name: Generate App Token
2020
id: app-token-generation

.github/workflows/autowiki.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
echo "SECRETS_ENABLED=$SECRET_EXISTS" >> $GITHUB_OUTPUT
2121
- name: Checkout
2222
if: steps.secrets_set.outputs.SECRETS_ENABLED
23-
uses: actions/checkout@v6
23+
uses: actions/checkout@v7
2424
- name: Install BYOND
2525
if: steps.secrets_set.outputs.SECRETS_ENABLED
2626
uses: ./.github/actions/restore_or_install_byond

.github/workflows/ci_suite.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ jobs:
5252
uses: ./.github/workflows/perform_regular_version_tests.yml
5353
with:
5454
maps: ${{ needs.collect_data.outputs.maps }}
55+
map_config: ${{ needs.collect_data.outputs.map_config }}
5556
max_required_byond_client: ${{ needs.collect_data.outputs.max_required_byond_client }}
5657

5758
run_alternate_tests:

.github/workflows/codeowner_reviews.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212

1313
steps:
1414
# Checks-out your repository under $GITHUB_WORKSPACE, so the job can access it
15-
- uses: actions/checkout@v6
15+
- uses: actions/checkout@v7
1616

1717
#Request reviews
1818
- name: Request reviews

.github/workflows/collect_data.yml

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ on:
66
maps:
77
description: "The maps that were found"
88
value: ${{ jobs.collect_data.outputs.maps }}
9+
map_config:
10+
description: "The map config file to use"
11+
value: ${{ jobs.collect_data.outputs.map_config }}
912
alternate_tests:
1013
description: "The alternate tests that were found"
1114
value: ${{ jobs.collect_data.outputs.alternate_tests }}
@@ -22,26 +25,38 @@ jobs:
2225
timeout-minutes: 5
2326
outputs:
2427
maps: ${{ steps.map_finder.outputs.maps }}
28+
map_config: ${{ steps.map_finder.outputs.map_config }}
2529
alternate_tests: ${{ steps.alternate_test_finder.outputs.alternate_tests }}
2630
max_required_byond_client: ${{ steps.max_required_byond_client.outputs.max_required_byond_client }}
2731
required_build_versions: ${{ steps.setup_required_build_versions.outputs.required_build_versions }}
2832

2933
steps:
30-
- uses: actions/checkout@v6
34+
- uses: actions/checkout@v7
3135
- name: Find Maps
3236
id: map_finder
3337
run: |
3438
> maps_output.txt
39+
> map_configs.txt
40+
3541
for file in _maps/*.json; do
3642
if ! jq -e '.exclude_from_ci == true' "$file" >/dev/null 2>&1; then
37-
echo "\"$(basename "$file" .json)\"" >> maps_output.txt
43+
map_name=$(basename "$file" .json)
44+
45+
echo "\"$map_name\"" >> maps_output.txt
46+
echo "map $map_name" >> map_configs.txt
47+
echo "endmap" >> map_configs.txt
3848
else
3949
echo "Excluded: $file"
4050
fi
4151
done
52+
4253
map_list=$(paste -sd, maps_output.txt)
4354
echo "Maps: $map_list"
4455
echo "maps={\"paths\":[$map_list]}" >> "$GITHUB_OUTPUT"
56+
57+
echo "map_config<<EOF" >> "$GITHUB_OUTPUT"
58+
cat map_configs.txt >> "$GITHUB_OUTPUT"
59+
echo "EOF" >> "$GITHUB_OUTPUT"
4560
- name: Find Alternate Tests
4661
id: alternate_test_finder
4762
run: |

.github/workflows/compare_screenshots.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
timeout-minutes: 15
99
runs-on: ubuntu-24.04
1010
steps:
11-
- uses: actions/checkout@v6
11+
- uses: actions/checkout@v7
1212
- name: Setup directory
1313
run: mkdir -p artifacts
1414
# If we ever add more artifacts, this is going to break, but it'll be obvious.

.github/workflows/compile_all_maps.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
timeout-minutes: 5
1515

1616
steps:
17-
- uses: actions/checkout@v6
17+
- uses: actions/checkout@v7
1818
- name: Setup Bun
1919
uses: ./.github/actions/setup_bun
2020
- name: Restore BYOND from Cache
@@ -35,7 +35,7 @@ jobs:
3535
timeout-minutes: 5
3636

3737
steps:
38-
- uses: actions/checkout@v6
38+
- uses: actions/checkout@v7
3939
- name: Setup Bun
4040
uses: ./.github/actions/setup_bun
4141
- name: Restore BYOND from Cache

.github/workflows/compile_changelogs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
3636
- name: "Checkout"
3737
if: steps.value_holder.outputs.ACTIONS_ENABLED
38-
uses: actions/checkout@v6
38+
uses: actions/checkout@v7
3939
with:
4040
fetch-depth: 25
4141
persist-credentials: false

.github/workflows/discord_discussions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
dotnet-quality: ga
3535

3636
- name: Checkout
37-
uses: actions/checkout@v6
37+
uses: actions/checkout@v7
3838

3939
- name: Build Tgstation.DiscordDiscussions
4040
run: dotnet publish -c Release -o discord_discussions_bins tools/Tgstation.DiscordDiscussions/Tgstation.DiscordDiscussions.csproj

.github/workflows/gbp.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
issues: write # to apply labels
1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@v6
15+
uses: actions/checkout@v7
1616
- name: Run Auto Labeler
1717
uses: actions/github-script@v9
1818
with:
@@ -40,15 +40,15 @@ jobs:
4040
echo "ACTIONS_ENABLED=$SECRET_EXISTS" >> $GITHUB_OUTPUT
4141
- name: Checkout
4242
if: steps.value_holder.outputs.ACTIONS_ENABLED
43-
uses: actions/checkout@v6
43+
uses: actions/checkout@v7
4444
- name: Setup git
4545
if: steps.value_holder.outputs.ACTIONS_ENABLED
4646
run: |
4747
git config --global user.name "gbp-action"
4848
git config --global user.email "<>"
4949
- name: Checkout alternate branch
5050
if: steps.value_holder.outputs.ACTIONS_ENABLED
51-
uses: actions/checkout@v6
51+
uses: actions/checkout@v7
5252
with:
5353
ref: "gbp-balances" # The branch name
5454
path: gbp-balances

0 commit comments

Comments
 (0)