Skip to content

Commit 377e492

Browse files
[MIRROR] Juke Build 0.9.0 (#344)
* Juke Build 0.9.0 (#61005) * 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 * Juke Build 0.9.0 Co-authored-by: Aleksej Komarov <[email protected]>
1 parent 7705d29 commit 377e492

34 files changed

+250
-697
lines changed

.github/workflows/ci_suite.yml

+2-11
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
bash tools/ci/check_changelogs.sh
4040
bash tools/ci/check_grep.sh
4141
bash tools/ci/check_misc.sh
42-
tools/build/build --ci lint
42+
tools/build/build --ci lint tgui-test
4343
tools/bootstrap/python -m dmi.test
4444
tools/bootstrap/python -m mapmerge2.dmm_test
4545
~/dreamchecker > ${GITHUB_WORKSPACE}/output-annotations.txt 2>&1
@@ -85,15 +85,6 @@ jobs:
8585
with:
8686
path: ~/BYOND
8787
key: ${{ runner.os }}-byond-${{ secrets.CACHE_PURGE_KEY }}
88-
- name: Restore Yarn cache
89-
uses: actions/cache@v2
90-
with:
91-
path: tgui/.yarn/cache
92-
key: ${{ runner.os }}-yarn-${{ secrets.CACHE_PURGE_KEY }}-${{ hashFiles('tgui/yarn.lock') }}
93-
restore-keys: |
94-
${{ runner.os }}-build-${{ secrets.CACHE_PURGE_KEY }}-
95-
${{ runner.os }}-build-
96-
${{ runner.os }}-
9788
- name: Setup database
9889
run: |
9990
sudo systemctl start mysql
@@ -111,7 +102,7 @@ jobs:
111102
run: |
112103
bash tools/ci/install_byond.sh
113104
source $HOME/BYOND/byond/bin/byondsetup
114-
tools/build/build --ci -DCIBUILDING
105+
tools/build/build --ci dm -DCIBUILDING
115106
bash tools/ci/run_server.sh
116107
117108
test_windows:

BUILD.bat

-3
This file was deleted.

BUILD.cmd

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

CLEAN.bat

-3
This file was deleted.

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ Mojave Sun is a post-apocalyptic SS13 server based on modern /tg/station.
2626

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

29-
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.
29+
**The quick way**. Find `bin/server.cmd` in this folder and double click it to automatically build and host the server on port 1337.
3030

31-
After it finishes, you can then [setup the server](.github/RUNNING_A_SERVER.md) normally by opening `tgstation.dmb` in DreamDaemon.
31+
**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.
3232

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

RUN_SERVER.bat

-3
This file was deleted.

bin/build.cmd

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

bin/clean.cmd

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

bin/server.cmd

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

bin/test.cmd

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

bin/tgui-build.cmd

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

bin/tgui-dev.cmd

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

bin/tgui-sonar.cmd

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

tgui/.editorconfig

-3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,3 @@ end_of_line = lf
88
charset = utf-8
99
trim_trailing_whitespace = true
1010
insert_final_newline = true
11-
12-
[*.md]
13-
max_line_length = 80

tgui/.eslintrc-harder.yml

-43
This file was deleted.

tgui/.eslintrc-sonar.yml

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
rules:
2+
# radar/cognitive-complexity: error
3+
radar/max-switch-cases: error
4+
radar/no-all-duplicated-branches: error
5+
radar/no-collapsible-if: error
6+
radar/no-collection-size-mischeck: error
7+
radar/no-duplicate-string: error
8+
radar/no-duplicated-branches: error
9+
radar/no-element-overwrite: error
10+
radar/no-extra-arguments: error
11+
radar/no-identical-conditions: error
12+
radar/no-identical-expressions: error
13+
radar/no-identical-functions: error
14+
radar/no-inverted-boolean-check: error
15+
radar/no-one-iteration-loop: error
16+
radar/no-redundant-boolean: error
17+
radar/no-redundant-jump: error
18+
radar/no-same-line-conditional: error
19+
radar/no-small-switch: error
20+
radar/no-unused-collection: error
21+
radar/no-use-of-empty-return-value: error
22+
radar/no-useless-catch: error
23+
radar/prefer-immediate-return: error
24+
radar/prefer-object-literal: error
25+
radar/prefer-single-boolean-return: error
26+
radar/prefer-while: error

tgui/.gitattributes

+3-4
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,9 @@
1313
*.md text eol=lf
1414
*.bat text eol=lf
1515
yarn.lock text eol=lf
16-
bin/tgui text eol=lf
1716

18-
## Treat bundles as binary and ignore them during conflicts
19-
*.bundle.* binary merge=tgui-merge-bundle
20-
*.chunk.* binary merge=tgui-merge-bundle
17+
## Treat bundles as binary
18+
*.bundle.* binary
19+
*.chunk.* binary
2120
.yarn/releases/**/* binary
2221
.yarn/plugins/**/* binary

tgui/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ package-lock.json
1616
/public/.tmp/**/*
1717
/public/**/*
1818
!/public/*.html
19+
/coverage
1920

2021
## Previously ignored locations that are kept to avoid confusing git
2122
## while transitioning to a new project structure.

0 commit comments

Comments
 (0)