Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Erikafox committed Dec 14, 2024
2 parents b24bc8a + 35a1d87 commit c58893e
Show file tree
Hide file tree
Showing 403 changed files with 19,453 additions and 65,019 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,16 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/stale@v4
- uses: actions/stale@v9
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-pr-message: "This PR has been inactive for a month. This means it is at risk of being auto closed in a week, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself"
days-before-stale: 30
days-before-close: 7
days-before-issue-stale: -1
stale-pr-label: "Stale"
exempt-pr-labels: "RED LABEL, Test Merged, Test Merge Candidate, Stale Exempt"
exempt-draft-pr: true

stale-issue-message: "This flaky fail has not been detected in 7 days. If it doesn't show up again in another 7 days, it will be auto-closed."
only-issue-labels: "🤖 Flaky Test Report"
days-before-issue-stale: 7

2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ RUN git init \
&& git remote add origin \$AUXMOS_REPO \
&& git fetch --depth 1 origin \$AUXMOS_VERSION" \
&& git checkout FETCH_HEAD \
&& env PKG_CONFIG_ALLOW_CROSS=1 cargo build --release --target=i686-unknown-linux-gnu --features "all_reaction_hooks,katmos"
&& env PKG_CONFIG_ALLOW_CROSS=1 cargo build --release --target=i686-unknown-linux-gnu --features "citadel_reactions,katmos"

# Install nodejs which is required to deploy Shiptest
FROM base as node
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/IceRuins/icemoon_ice_lodge.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@
/obj/effect/turf_decal/corner/opaque/blue/diagonal,
/obj/structure/table/wood,
/obj/item/melee/baton/cattleprod/loaded,
/obj/item/storage/backpack/duffelbag/med/surgery,
/obj/item/storage/case/surgery,
/turf/open/floor/plasteel/white,
/area/ruin/powered/icemoon/lodge/residential)
"dV" = (
Expand Down
Loading

0 comments on commit c58893e

Please sign in to comment.