Skip to content

Commit

Permalink
[MIRROR] Juke Build (#6313)
Browse files Browse the repository at this point in the history
* Juke Build (#59390)

* Juke Build Hotfix 1 (#59643)

* Juke Build Fix

* More fixes

* Juke Build Hotfix 2 - PreCompile script compatibility (#59649)

* Juke Build Hotfix 2 - PreCompile script compatibility

* Pass arguments from bat to build.js

* Pass arguments in BUILD.bat as well

* Quick tweak

* Modular Skyrat detection~

Co-authored-by: Aleksej Komarov <[email protected]>
  • Loading branch information
Funce and stylemistake authored Jun 14, 2021
1 parent d322644 commit df9e818
Show file tree
Hide file tree
Showing 22 changed files with 7,623 additions and 3,815 deletions.
8 changes: 2 additions & 6 deletions .github/workflows/ci_suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,7 @@ jobs:
bash tools/ci/install_byond.sh
source $HOME/BYOND/byond/bin/byondsetup
python3 tools/ci/template_dm_generator.py
tools/build/build
env:
CBT_BUILD_MODE : ALL_MAPS
tools/build/build dm -DCIBUILDING -DCITESTING -DALL_MAPS
run_all_tests:
if: "!contains(github.event.head_commit.message, '[ci skip]')"
Expand Down Expand Up @@ -98,10 +96,8 @@ jobs:
run: |
bash tools/ci/install_byond.sh
source $HOME/BYOND/byond/bin/byondsetup
tools/build/build
tools/build/build -DCIBUILDING
bash tools/ci/run_server.sh
env:
CBT_BUILD_MODE: TEST_RUN
test_windows:
if: "!contains(github.event.head_commit.message, '[ci skip]')"
Expand Down
5 changes: 3 additions & 2 deletions BUILD.bat
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
@call "%~dp0\tools\build\build"
@pause
@echo off
call "%~dp0\tools\build\build.bat" %*
pause
18 changes: 10 additions & 8 deletions code/modules/asset_cache/asset_list_items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@
/datum/asset/simple/tgui_common
keep_local_name = TRUE
assets = list(
"tgui-common.bundle.js" = 'tgui/public/tgui-common.bundle.js',
"tgui-common.bundle.js" = file("tgui/public/tgui-common.bundle.js"),
)

/datum/asset/simple/tgui
keep_local_name = TRUE
assets = list(
"tgui.bundle.js" = 'tgui/public/tgui.bundle.js',
"tgui.bundle.css" = 'tgui/public/tgui.bundle.css',
"tgui.bundle.js" = file("tgui/public/tgui.bundle.js"),
"tgui.bundle.css" = file("tgui/public/tgui.bundle.css"),
)

/datum/asset/simple/tgui_panel
keep_local_name = TRUE
assets = list(
"tgui-panel.bundle.js" = 'tgui/public/tgui-panel.bundle.js',
"tgui-panel.bundle.css" = 'tgui/public/tgui-panel.bundle.css',
"tgui-panel.bundle.js" = file("tgui/public/tgui-panel.bundle.js"),
"tgui-panel.bundle.css" = file("tgui/public/tgui-panel.bundle.css"),
)

/datum/asset/simple/headers
Expand Down Expand Up @@ -149,10 +149,12 @@

/datum/asset/simple/namespaced/tgfont
assets = list(
"tgfont.eot" = 'tgui/packages/tgfont/dist/tgfont.eot',
"tgfont.woff2" = 'tgui/packages/tgfont/dist/tgfont.woff2',
"tgfont.eot" = file("tgui/packages/tgfont/dist/tgfont.eot"),
"tgfont.woff2" = file("tgui/packages/tgfont/dist/tgfont.woff2"),
)
parents = list(
"tgfont.css" = file("tgui/packages/tgfont/dist/tgfont.css"),
)
parents = list("tgfont.css" = 'tgui/packages/tgfont/dist/tgfont.css')

/datum/asset/spritesheet/chat
name = "chat"
Expand Down
3 changes: 2 additions & 1 deletion tools/bootstrap/python.bat
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
@call powershell.exe -NoLogo -ExecutionPolicy Bypass -File "%~dp0\python_.ps1" %*
@echo off
call powershell.exe -NoLogo -ExecutionPolicy Bypass -File "%~dp0\python_.ps1" %*
3 changes: 2 additions & 1 deletion tools/build/build.bat
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
@"%~dp0\..\bootstrap\node" "%~dp0\build.js"
@echo off
"%~dp0\..\bootstrap\node.bat" "%~dp0\build.js" %*
Loading

0 comments on commit df9e818

Please sign in to comment.