24-09 merge #99

24-09 merge

.github/workflows/ci_suite.yml

@@ -69,12 +69,7 @@ jobs:
           tools/bootstrap/python -m define_sanity.check
           tools/bootstrap/python -m dmi.test
           tools/bootstrap/python -m mapmerge2.dmm_test
-          ~/dreamchecker > ${GITHUB_WORKSPACE}/output-annotations.txt 2>&1
-      - name: Annotate Lints
-        uses: yogstation13/DreamAnnotate@v2
-        if: always()
-        with:
-          outputFile: output-annotations.txt
+          ~/dreamchecker 2>&1 | bash tools/ci/annotate_dm.sh
 
   compile_all_maps:
     if: "!contains(github.event.head_commit.message, '[ci skip]')"

.github/workflows/run_integration_tests.yml

@@ -63,7 +63,6 @@ jobs:
           tools/build/build --ci dm -DCIBUILDING -DANSICOLORS -WError -NWTG0001
       - name: Run Tests
         run: |
-          cp libbyond_sleeping_procs.so ~/.byond/bin/libbyond_sleeping_procs.so
           source $HOME/BYOND/byond/bin/byondsetup
           bash tools/ci/run_server.sh ${{ inputs.map }}
       - name: Upload screenshot tests

.gitignore

@@ -24,9 +24,6 @@
 # Ignore compiled linux libs in the root folder, e.g. librust_g.so
 /*.so
 
-# Remove when removing byond_status
-!/libbyond_sleeping_procs.so
-
 #Ignore compiled files and other files generated during compilation.
 *.mdme
 *.mdme.*