ci update

.github/workflows/ci_suite.yml

@@ -23,7 +23,7 @@ jobs:
           pip3 install setuptools
           bash tools/ci/install_build_tools.sh
           bash tools/ci/install_spaceman_dmm.sh dreamchecker
-          pip3 install -r tools/mapmerge2/requirements.txt
+          pip3 install -r tools/requirements.txt
       - name: Run Linters
         run: |
           bash tools/ci/check_filedirs.sh tgstation.dme
@@ -32,7 +32,7 @@ jobs:
           find . -name "*.json" -not -path "*/node_modules/*" -print0 | xargs -0 python3 ./tools/json_verifier.py
           bash tools/ci/build_tgui.sh
           bash tools/ci/check_grep.sh
-          python3 tools/mapmerge2/dmi.py --test
+          tools/bootstrap/python -m dmi.test
           ~/dreamchecker > ${GITHUB_WORKSPACE}/output-annotations.txt 2>&1
       - name: Annotate Lints
         uses: yogstation13/DreamAnnotate@v1
@@ -89,12 +89,12 @@ jobs:
           sudo apt update || true
           sudo apt install libssl1.1:i386
           bash tools/ci/install_rust_g.sh
-      # - name: Compile and run tests
-      #   run: |
-      #     bash tools/ci/install_byond.sh
-      #     source $HOME/BYOND/byond/bin/byondsetup
-      #     bash tools/ci/dm.sh -DCIBUILDING tgstation.dme
-      #     bash tools/ci/run_server.sh
+      - name: Compile and run tests
+        run: |
+          bash tools/ci/install_byond.sh
+          source $HOME/BYOND/byond/bin/byondsetup
+          bash tools/ci/dm.sh -DCIBUILDING tgstation.dme
+          bash tools/ci/run_server.sh
   test_windows:
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
     name: Windows Build

.github/workflows/docker_publish.yml

@@ -7,6 +7,7 @@ on:
 
 jobs:
   publish:
+    if: "!contains(github.event.head_commit.message, '[ci skip]')"
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2