[MIRROR][NO GBP] missed mirror 66864 (#13570)

* Mirror upstream 66864 * Update for logging reshuffling * METASTATION MAP RESET * METASTATION MAP RESET PT2 * TRAMSTATION RESET * KILOSTATION MAP RESET * ICEBOX RESET * DELTA RESET * ok Co-authored-by: Gandalf <[email protected]>
NithaIsTired · May 24, 2022 · 26e7d42 · 26e7d42
1 parent 262db75
commit 26e7d42
Show file tree

Hide file tree

Showing 17 changed files with 387,908 additions and 1,045,109 deletions.
diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml
@@ -66,10 +66,31 @@ jobs:
           source $HOME/BYOND/byond/bin/byondsetup
           tools/build/build --ci dm -DCIBUILDING -DCITESTING -DALL_MAPS
 
+  find_all_maps:
+    if: "!contains(github.event.head_commit.message, '[ci skip]')"
+    name: Find Maps to Test
+    runs-on: ubuntu-20.04
+    outputs:
+      maps: ${{ steps.map_finder.outputs.maps }}
+    steps:
+      - uses: actions/checkout@v2
+      - name: Find Maps
+        id: map_finder
+        run: |
+          echo "$(ls -mw0 _maps/*.json)" > maps_output.txt
+          sed -i -e s+_maps/+\"+g -e s+.json+\"+g maps_output.txt
+          echo "Maps: $(cat maps_output.txt)"
+          echo "::set-output name=maps::{\"paths\":[$(cat maps_output.txt)]}"
+
   run_all_tests:
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
     name: Integration Tests
     runs-on: ubuntu-20.04
+    needs: [find_all_maps]
+    strategy:
+      fail-fast: false
+      matrix:
+        map: ${{ fromJSON(needs.find_all_maps.outputs.maps).paths }}
     services:
       mysql:
         image: mysql:latest
@@ -78,6 +99,9 @@ jobs:
         ports:
           - 3306
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+    concurrency:
+      group: ci-${{ github.ref }}-${{ matrix.map }}
+      cancel-in-progress: true
     steps:
       - uses: actions/checkout@v2
       - name: Restore BYOND cache
@@ -106,7 +130,7 @@ jobs:
       - name: Run Tests
         run: |
           source $HOME/BYOND/byond/bin/byondsetup
-          bash tools/ci/run_server.sh
+          bash tools/ci/run_server.sh ${{ matrix.map }}
 
   test_windows:
     if: "!contains(github.event.head_commit.message, '[ci skip]')"

diff --git a/_maps/map_files/Blueshift/BlueShift_lower.dmm b/_maps/map_files/Blueshift/BlueShift_lower.dmm
@@ -23067,9 +23067,8 @@
 /turf/open/floor/engine/n2,
 /area/station/engineering/atmos)
 "slG" = (
-/obj/effect/turf_decal/bot,
-/obj/structure/closet/crate/mail/full,
-/turf/open/floor/iron/dark,
+/obj/structure/closet/crate/mail/economy,
+/turf/open/floor/iron,
 /area/station/cargo/storage)
 "slK" = (
 /obj/machinery/atmospherics/pipe/smart/simple/purple/visible/layer2{
@@ -72651,7 +72650,7 @@ xZF
 vHs
 tlm
 fQC
-xPI
+slG
 ljZ
 aue
 csQ
@@ -72909,7 +72908,7 @@ vHs
 tzf
 xPI
 biE
-slG
+wHB
 uTG
 ijj
 uNo