Moved stuff to proper places

.github/workflows/ci.yml

@@ -19,6 +19,16 @@ jobs:
       - name: Install Tools
         run: |
           bash tools/ci/install_build_deps.sh
+      - name: Restore Yarn cache
+        if: "${{ contains(github.event.pull_request.labels.*.name, 'Type: TGUI Bundle') }}"
+        uses: actions/cache@v3
+        with:
+          path: tgui/.yarn/cache
+          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: Run Tests
         run: |
           tools/ci/validate_files.sh
@@ -37,17 +47,6 @@ jobs:
           key: ${{ runner.os }}-dreamchecker-${{ hashFiles('dependencies.sh')}}
           restore-keys: ${{ runner.os }}-dreamchecker
 
-      - name: Restore Yarn cache
-        if: "${{ contains(github.event.pull_request.labels.*.name, 'Type: TGUI Bundle') }}"
-        uses: actions/cache@v3
-        with:
-          path: tgui/.yarn/cache
-          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 Dependencies
         run: |
           tools/ci/install_spaceman_dmm.sh dreamchecker
@@ -57,17 +56,6 @@ jobs:
         run: |
           ~/dreamchecker > ${GITHUB_WORKSPACE}/output-annotations.txt 2>&1
 
-      - name: TGUI Linters
-        # if: "${{ contains(github.event.pull_request.labels.*.name, 'Type: TGUI Bundle') }}"
-        if: ${{ false }}
-        run: |
-          cd tgui
-          yarn install
-          yarn tgui:prettier
-          yarn run tsc
-          yarn run eslint packages --ext ".js,.cjs,.ts,.tsx" @Args
-          cd ..
-
       - name: Annotate Linter
         uses: yogstation13/DreamAnnotate@v1
         if: always()

tools/ci/build_tgui.sh

@@ -9,4 +9,5 @@ cd tgui
 chmod +x bin/tgui
 bin/tgui --lint
 bin/tgui --test
+yarn tgui:prettier
 cd ..