ci update

.editorconfig

@@ -4,7 +4,7 @@ indent_size = 4
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
-#end_of_line = lf
+# end_of_line = lf
 
 [*.yml]
 indent_style = space

.gitattributes

@@ -1,8 +1,7 @@
 * text=auto
 
 ## Enforce text mode and LF line breaks
-## porter note: not yet LFing dm.
-# *.bat text eol=lf
+*.bat text eol=lf
 *.css text eol=lf
 # *.dm text eol=lf
 # *.dme text eol=lf
@@ -12,15 +11,15 @@
 *.js text eol=lf
 *.json text eol=lf
 *.jsx text eol=lf
-# *.md text eol=lf
+*.md text eol=lf
 *.py text eol=lf
 *.scss text eol=lf
-# *.sh text eol=lf
+*.sh text eol=lf
 # *.sql text eol=lf
 *.svg text eol=lf
 *.ts text eol=lf
 *.tsx text eol=lf
-# *.txt text eol=lf
+*.txt text eol=lf
 *.yaml text eol=lf
 *.yml text eol=lf
 

.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

dependencies.sh

@@ -1,13 +1,13 @@
-#!/bin/bash
+#!/bin/sh
 
 #Project dependencies file
 #Final authority on what's required to fully build the project
 
 # byond version
 # Extracted from the Dockerfile. Change by editing Dockerfile's FROM command.
-LIST=($(sed -n 's/.*byond:\([0-9]\+\)\.\([0-9]\+\).*/\1 \2/p' Dockerfile))
-export BYOND_MAJOR=${LIST[0]}
-export BYOND_MINOR=${LIST[1]}
+LIST="$(sed -n 's/.*byond:\([0-9]\+\)\.\([0-9]\+\).*/\1 \2/p' Dockerfile)"
+export BYOND_MAJOR=${LIST% *}
+export BYOND_MINOR=${LIST#* }
 unset LIST
 
 #rust_g git tag
@@ -21,3 +21,6 @@ export SPACEMAN_DMM_VERSION=suite-1.6
 
 # Extools git tag
 export EXTOOLS_VERSION=v0.0.6
+
+# Python version for mapmerge and other tools
+export PYTHON_VERSION=3.6.8