[MIRROR] Exit on DreamMaker warnings in CI Windows build + Tools rese…

…t (#7784)

* Exit on DreamMaker warnings in CI Windows build

* a

* AAAAAAAAAAAAAAAAA

* AAAAAA

* F

* a

* Update .github/gbp.toml

* Update .github/gbp.toml

* Update .github/gbp.toml

* Update .github/gbp.toml

Co-authored-by: mokulus <[email protected]>
Co-authored-by: Gandalf <[email protected]>

.gitattributes

@@ -41,3 +41,4 @@
 
 ## Force tab indents on dm files
 *.dm whitespace=indent-with-non-tab
+

.github/workflows/ci_suite.yml

@@ -22,7 +22,11 @@ jobs:
         uses: actions/cache@v2
         with:
           path: tgui/.yarn/cache
-          key: ${{ runner.os }}-yarn-${{ secrets.CACHE_PURGE_KEY }}
+          key: ${{ runner.os }}-yarn-${{ secrets.CACHE_PURGE_KEY }}-${{ hashFiles('tgui/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ secrets.CACHE_PURGE_KEY }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
       - name: Install Tools
         run: |
           pip3 install setuptools
@@ -35,7 +39,7 @@ jobs:
           bash tools/ci/check_changelogs.sh
           bash tools/ci/check_grep.sh
           bash tools/ci/check_misc.sh
-          tools/build/build --ci lint
+          tools/build/build --ci lint tgui-test
           tools/bootstrap/python -m dmi.test
           tools/bootstrap/python -m mapmerge2.dmm_test
           ~/dreamchecker > ${GITHUB_WORKSPACE}/output-annotations.txt 2>&1
@@ -81,11 +85,6 @@ jobs:
         with:
           path: ~/BYOND
           key: ${{ runner.os }}-byond-${{ secrets.CACHE_PURGE_KEY }}
-      - name: Restore Yarn Cache
-        uses: actions/cache@v2
-        with:
-          path: tgui/.yarn/cache
-          key: ${{ runner.os }}-yarn-${{ secrets.CACHE_PURGE_KEY }}
       - name: Setup database
         run: |
           sudo systemctl start mysql
@@ -103,7 +102,7 @@ jobs:
         run: |
           bash tools/ci/install_byond.sh
           source $HOME/BYOND/byond/bin/byondsetup
-          tools/build/build --ci -DCIBUILDING
+          tools/build/build --ci dm -DCIBUILDING
           bash tools/ci/run_server.sh
 
   test_windows:
@@ -112,11 +111,15 @@ jobs:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Restore Yarn Cache
+      - name: Restore Yarn cache
         uses: actions/cache@v2
         with:
           path: tgui/.yarn/cache
-          key: ${{ runner.os }}-yarn-${{ secrets.CACHE_PURGE_KEY }}
+          key: ${{ runner.os }}-yarn-${{ secrets.CACHE_PURGE_KEY }}-${{ hashFiles('tgui/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ secrets.CACHE_PURGE_KEY }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
       - name: Compile
         run: pwsh tools/ci/build.ps1
         env:

.github/workflows/compile_changelogs.yml

@@ -9,44 +9,44 @@ jobs:
     name: "Compile changelogs"
     runs-on: ubuntu-20.04
     steps:
-      - name: "Check for CHANGELOG_ENABLER secret and pass true to output if it exists to be checked by later steps"
+      - name: "Check for ACTION_ENABLER secret and pass true to output if it exists to be checked by later steps"
         id: value_holder
         env:
-          CHANGELOG_ENABLER: ${{ secrets.CHANGELOG_ENABLER }}
+          ENABLER_SECRET: ${{ secrets.ACTION_ENABLER }}
         run: |
           unset SECRET_EXISTS
-          if [ -n $CHANGELOG_ENABLER ]; then SECRET_EXISTS='true' ; fi
-          echo ::set-output name=CL_ENABLED::${SECRET_EXISTS}
+          if [ -n "$ENABLER_SECRET" ]; then SECRET_EXISTS=true ; fi
+          echo "::set-output name=ACTIONS_ENABLED::$SECRET_EXISTS"
       - name: "Setup python"
-        if: steps.value_holder.outputs.CL_ENABLED
+        if: steps.value_holder.outputs.ACTIONS_ENABLED
         uses: actions/setup-python@v1
         with:
           python-version: '3.x'
       - name: "Install deps"
-        if: steps.value_holder.outputs.CL_ENABLED
+        if: steps.value_holder.outputs.ACTIONS_ENABLED
         run: |
           python -m pip install --upgrade pip
           python -m pip install pyyaml
           sudo apt-get install  dos2unix
       - name: "Checkout"
-        if: steps.value_holder.outputs.CL_ENABLED
+        if: steps.value_holder.outputs.ACTIONS_ENABLED
         uses: actions/checkout@v1
         with:
           fetch-depth: 25
       - name: "Compile"
-        if: steps.value_holder.outputs.CL_ENABLED
+        if: steps.value_holder.outputs.ACTIONS_ENABLED
         run: |
           python tools/ss13_genchangelog.py html/changelogs
       - name: Commit
-        if: steps.value_holder.outputs.CL_ENABLED
+        if: steps.value_holder.outputs.ACTIONS_ENABLED
         run: |
           git config --local user.email "[email protected]"
           git config --local user.name "Changelogs"
           git pull origin master
           git add html/changelogs
           git commit -m "Automatic changelog compile [ci skip]" -a || true
       - name: "Push"
-        if: steps.value_holder.outputs.CL_ENABLED
+        if: steps.value_holder.outputs.ACTIONS_ENABLED
         uses: ad-m/github-push-action@master
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/gbp.yml

@@ -6,22 +6,35 @@ jobs:
   gbp:
     runs-on: ubuntu-latest
     steps:
+    - name: "Check for ACTION_ENABLER secret and pass true to output if it exists to be checked by later steps"
+      id: value_holder
+      env:
+        ENABLER_SECRET: ${{ secrets.ACTION_ENABLER }}
+      run: |
+        unset SECRET_EXISTS
+        if [ -n "$ENABLER_SECRET" ]; then SECRET_EXISTS=true ; fi
+        echo "::set-output name=ACTIONS_ENABLED::$SECRET_EXISTS"
     - name: Checkout
+      if: steps.value_holder.outputs.ACTIONS_ENABLED
       uses: actions/checkout@v2
     - name: Setup git
+      if: steps.value_holder.outputs.ACTIONS_ENABLED
       run: |
         git config --global user.name "gbp-action"
         git config --global user.email "<>"
     - name: Checkout alternate branch
+      if: steps.value_holder.outputs.ACTIONS_ENABLED
       uses: actions/checkout@v2
       with:
         ref: "gbp-balances" # The branch name
         path: gbp-balances
     # This is to ensure we keep the gbp.toml from master
     # without having to update our separate branch.
     - name: Copy configuration
+      if: steps.value_holder.outputs.ACTIONS_ENABLED
       run: cp ./.github/gbp.toml ./gbp-balances/.github/gbp.toml
     - name: GBP action
+      if: steps.value_holder.outputs.ACTIONS_ENABLED
       uses: tgstation/gbp-action@master
       with:
         branch: "gbp-balances"

.github/workflows/gbp_collect.yml

@@ -8,22 +8,35 @@ jobs:
   gbp_collection:
     runs-on: ubuntu-latest
     steps:
+    - name: "Check for ACTION_ENABLER secret and pass true to output if it exists to be checked by later steps"
+      id: value_holder
+      env:
+        ENABLER_SECRET: ${{ secrets.ACTION_ENABLER }}
+      run: |
+        unset SECRET_EXISTS
+        if [ -n "$ENABLER_SECRET" ]; then SECRET_EXISTS=true ; fi
+        echo "::set-output name=ACTIONS_ENABLED::$SECRET_EXISTS"
     - name: Checkout
+      if: steps.value_holder.outputs.ACTIONS_ENABLED
       uses: actions/checkout@v2
     - name: Setup git
+      if: steps.value_holder.outputs.ACTIONS_ENABLED
       run: |
         git config --global user.name "github-actions[bot]"
         git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
     - name: Checkout alternate branch
+      if: steps.value_holder.outputs.ACTIONS_ENABLED
       uses: actions/checkout@v2
       with:
         ref: "gbp-balances" # The branch name
         path: gbp-balances
     # This is to ensure we keep the gbp.toml from master
     # without having to update our separate branch.
     - name: Copy configuration
+      if: steps.value_holder.outputs.ACTIONS_ENABLED
       run: cp ./.github/gbp.toml ./gbp-balances/.github/gbp.toml
     - name: GBP action
+      if: steps.value_holder.outputs.ACTIONS_ENABLED
       uses: Mothblocks/gbp-action@collate-changes
       with:
         collect: "true"

.github/workflows/generate_documentation.yml

@@ -12,8 +12,8 @@ jobs:
       - name: Setup cache
         uses: actions/cache@v2
         with:
-          path: $HOME/SpacemanDMM
-          key: ${{ runner.os }}-spacemandmm
+          path: ~/SpacemanDMM
+          key: ${{ runner.os }}-spacemandmm-${{ secrets.CACHE_PURGE_KEY }}
       - name: Install SpacemanDMM
         run: bash tools/ci/install_spaceman_dmm.sh dmdoc
       - name: Generate documentation

.github/workflows/pr_emoji.yml

@@ -0,0 +1,19 @@
+name: PR emoji stripper
+on:
+  pull_request_target:
+    types: [opened, edited]
+
+permissions:
+  pull-requests: write
+
+jobs:
+  title_and_changelog:
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: Wayland-Smithy/emoji-stripper-action@8f4c2fe9748bb9b02f105be4e72a1a42b0f34d84
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        title: true
+        body: true
+        body-after: ":cl:"
+        body-before: "/:cl:"

BUILD.cmd

@@ -0,0 +1,2 @@
+@echo off
+call "%~dp0\tools\build\build.bat" --wait-on-error build %*

Dockerfile

@@ -82,4 +82,4 @@ COPY --from=rust_g /rust_g/target/i686-unknown-linux-gnu/release/librust_g.so ./
 
 VOLUME [ "/tgstation/config", "/tgstation/data" ]
 ENTRYPOINT [ "DreamDaemon", "tgstation.dmb", "-port", "1337", "-trusted", "-close", "-verbose" ]
-EXPOSE 1337
+EXPOSE 1337

bin/build.cmd

@@ -0,0 +1,2 @@
+@echo off
+call "%~dp0\..\tools\build\build.bat" --wait-on-error build %*

bin/clean.cmd

@@ -0,0 +1,2 @@
+@echo off
+call "%~dp0\..\tools\build\build.bat" --wait-on-error clean-all %*

bin/server.cmd

@@ -0,0 +1,2 @@
+@echo off
+call "%~dp0\..\tools\build\build.bat" --wait-on-error server %*

bin/test.cmd

@@ -0,0 +1,2 @@
+@echo off
+call "%~dp0\..\tools\build\build.bat" --wait-on-error dm-test %*

bin/tgui-build.cmd

@@ -0,0 +1,2 @@
+@echo off
+call "%~dp0\..\tools\build\build.bat" --wait-on-error tgui tgui-lint tgui-test %*

bin/tgui-dev.cmd

@@ -0,0 +1,2 @@
+@echo off
+call "%~dp0\..\tools\build\build.bat" --wait-on-error tgui-dev %*

bin/tgui-sonar.cmd

@@ -0,0 +1,2 @@
+@echo off
+call "%~dp0\..\tools\build\build.bat" --wait-on-error tgui-sonar %*

tgui/.editorconfig

@@ -8,6 +8,3 @@ end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
-
-[*.md]
-max_line_length = 80

tgui/.gitattributes

@@ -13,10 +13,9 @@
 *.md text eol=lf
 *.bat text eol=lf
 yarn.lock text eol=lf
-bin/tgui text eol=lf
 
-## Treat bundles as binary and ignore them during conflicts
-*.bundle.* binary merge=tgui-merge-bundle
-*.chunk.* binary merge=tgui-merge-bundle
+## Treat bundles as binary
+*.bundle.* binary
+*.chunk.* binary
 .yarn/releases/**/* binary
 .yarn/plugins/**/* binary

tgui/.gitignore

@@ -16,6 +16,7 @@ package-lock.json
 /public/.tmp/**/*
 /public/**/*
 !/public/*.html
+/coverage
 
 ## Previously ignored locations that are kept to avoid confusing git
 ## while transitioning to a new project structure.