Skip to content

Commit

Permalink
Juke Build 0.9.0 (tgstation#61005)
Browse files Browse the repository at this point in the history
* Juke Build 0.9.0

* Fix a small bug with build.js

* Distill cmds

* Return sonar

* Revert those build.cmd changes

* Some improvements

* Treat all sonar warnings as errors because they should fail the sonar target

* Do not clean up bootstrap cache because it locks up on removing it
  • Loading branch information
stylemistake authored Aug 25, 2021
1 parent 3ca0d6f commit a7753ad
Show file tree
Hide file tree
Showing 34 changed files with 250 additions and 697 deletions.
13 changes: 2 additions & 11 deletions .github/workflows/ci_suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,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
Expand Down Expand Up @@ -85,15 +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 }}-${{ hashFiles('tgui/yarn.lock') }}
restore-keys: |
${{ runner.os }}-build-${{ secrets.CACHE_PURGE_KEY }}-
${{ runner.os }}-build-
${{ runner.os }}-
- name: Setup database
run: |
sudo systemctl start mysql
Expand All @@ -111,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:
Expand Down
3 changes: 0 additions & 3 deletions BUILD.bat

This file was deleted.

2 changes: 2 additions & 0 deletions BUILD.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@echo off
call "%~dp0\tools\build\build.bat" --wait-on-error build %*
3 changes: 0 additions & 3 deletions CLEAN.bat

This file was deleted.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ Space Station 13 is a paranoia-laden round-based roleplaying game set against th

On **2021-01-04** we have changed the way to compile the codebase.

Find `BUILD.bat` here in the root folder of tgstation, and double click it to initiate the build. It consists of multiple steps and might take around 1-5 minutes to compile.
**The quick way**. Find `bin/server.cmd` in this folder and double click it to automatically build and host the server on port 1337.

After it finishes, you can then [setup the server](.github/RUNNING_A_SERVER.md) normally by opening `tgstation.dmb` in DreamDaemon.
**The long way**. Find `bin/build.cmd` in this folder, and double click it to initiate the build. It consists of multiple steps and might take around 1-5 minutes to compile. If it closes, it means it has finished its job. You can then [setup the server](.github/RUNNING_A_SERVER.md) normally by opening `tgstation.dmb` in DreamDaemon.

**Building tgstation in DreamMaker directly is now deprecated and might produce errors**, such as `'tgui.bundle.js': cannot find file`.

Expand Down
3 changes: 0 additions & 3 deletions RUN_SERVER.bat

This file was deleted.

2 changes: 2 additions & 0 deletions bin/build.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@echo off
call "%~dp0\..\tools\build\build.bat" --wait-on-error build %*
2 changes: 2 additions & 0 deletions bin/clean.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@echo off
call "%~dp0\..\tools\build\build.bat" --wait-on-error clean-all %*
2 changes: 2 additions & 0 deletions bin/server.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@echo off
call "%~dp0\..\tools\build\build.bat" --wait-on-error server %*
2 changes: 2 additions & 0 deletions bin/test.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@echo off
call "%~dp0\..\tools\build\build.bat" --wait-on-error dm-test %*
2 changes: 2 additions & 0 deletions bin/tgui-build.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@echo off
call "%~dp0\..\tools\build\build.bat" --wait-on-error tgui tgui-lint tgui-test %*
2 changes: 2 additions & 0 deletions bin/tgui-dev.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@echo off
call "%~dp0\..\tools\build\build.bat" --wait-on-error tgui-dev %*
2 changes: 2 additions & 0 deletions bin/tgui-sonar.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@echo off
call "%~dp0\..\tools\build\build.bat" --wait-on-error tgui-sonar %*
3 changes: 0 additions & 3 deletions tgui/.editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,3 @@ end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[*.md]
max_line_length = 80
43 changes: 0 additions & 43 deletions tgui/.eslintrc-harder.yml

This file was deleted.

26 changes: 26 additions & 0 deletions tgui/.eslintrc-sonar.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
rules:
# radar/cognitive-complexity: error
radar/max-switch-cases: error
radar/no-all-duplicated-branches: error
radar/no-collapsible-if: error
radar/no-collection-size-mischeck: error
radar/no-duplicate-string: error
radar/no-duplicated-branches: error
radar/no-element-overwrite: error
radar/no-extra-arguments: error
radar/no-identical-conditions: error
radar/no-identical-expressions: error
radar/no-identical-functions: error
radar/no-inverted-boolean-check: error
radar/no-one-iteration-loop: error
radar/no-redundant-boolean: error
radar/no-redundant-jump: error
radar/no-same-line-conditional: error
radar/no-small-switch: error
radar/no-unused-collection: error
radar/no-use-of-empty-return-value: error
radar/no-useless-catch: error
radar/prefer-immediate-return: error
radar/prefer-object-literal: error
radar/prefer-single-boolean-return: error
radar/prefer-while: error
7 changes: 3 additions & 4 deletions tgui/.gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions tgui/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Loading

0 comments on commit a7753ad

Please sign in to comment.