diff --git a/.gitmodules b/.gitmodules index 0a31796237..0cbc6f9621 100644 --- a/.gitmodules +++ b/.gitmodules @@ -179,9 +179,6 @@ [submodule "vendor/libnyquist"] path = vendor/libnyquist url = https://github.com/ddiakopoulos/libnyquist.git -[submodule "ext/txAdmin"] - path = ext/txAdmin - url = https://github.com/citizenfx/txAdmin.git [submodule "vendor/prometheus-cpp"] path = vendor/prometheus-cpp url = https://github.com/jupp0r/prometheus-cpp.git diff --git a/code/tools/ci/psm1/cfxVersions.psm1 b/code/tools/ci/psm1/cfxVersions.psm1 index 3781894355..a0f751a9f6 100644 --- a/code/tools/ci/psm1/cfxVersions.psm1 +++ b/code/tools/ci/psm1/cfxVersions.psm1 @@ -101,7 +101,6 @@ function Get-CfxVersions { $versions.UI = ((git rev-list $versions.UICommit | measure-object).Count * 10) + 1100000 $SystemResourcesPaths = @( - "ext/txAdmin" "ext/system-resources" ) $versions.SystemResourcesCommit = (git rev-list -1 HEAD $SystemResourcesPaths) diff --git a/ext/README.md b/ext/README.md index 369d2cef04..e5fdbecb96 100644 --- a/ext/README.md +++ b/ext/README.md @@ -14,7 +14,6 @@ part of the main project. * [**nuget/**](./nuget): Build files for the `CitizenFX.Core.Client` and `CitizenFX.Core.Server` NuGet packages. * [**symbol-upload/**](./symbol-upload): A tool to collect Linux build symbols to upload to a .NET Core-style symbol server. * [**system-resources/**](./system-resources): System resources bundled with FXServer by default. -* [**txAdmin/**](./txAdmin): A local snapshot of [txAdmin](https://github.com/tabarra/txAdmin), the official server monitor/management dashboard. * [**typings/**](./typings): Build files for the `@citizenfx/client` and `@citizenfx/server` NPM packages. * [**ui-build/**](./ui-build): Scripts and data files for building `citizen/ui.zip` including root helpers, legacy UI scripts and a packed version of `cfx-ui`. * [**webadmin/**](./webadmin): In-process web dashboard system resource. \ No newline at end of file diff --git a/ext/system-resources/build.cmd b/ext/system-resources/build.cmd index d6c9b12915..f191bc6bc9 100644 --- a/ext/system-resources/build.cmd +++ b/ext/system-resources/build.cmd @@ -11,19 +11,18 @@ if "%1" == "chat" goto chat set SRRoot=%~dp0\data pushd %~dp0 -:: txadmin -pushd ..\txAdmin -rmdir /s /q dist +:: txAdmin +set MonitorArtifactURL="https://github.com/tabarra/txAdmin/releases/download/v7.0.0/monitor.zip" -call npm install npm@8.13.2 -call node_modules\.bin\npm ci -call node_modules\.bin\npm run build 2>&1 | findstr /V "not found" -popd +set MonitorPath=%SRRoot%\monitor +set MonitorArtifactPath=%SRRoot%\monitor.zip -rmdir /s /q %SRRoot%\monitor\ -mkdir %SRRoot%\monitor\ +rmdir /s /q %MonitorPath% +mkdir %MonitorPath% -xcopy /y /e ..\txAdmin\dist %SRRoot%\monitor +curl -Lo %MonitorArtifactPath% %MonitorArtifactURL% +tar -C %MonitorPath%\ -xf %MonitorArtifactPath% +del %MonitorArtifactPath% :: chat :chat diff --git a/ext/system-resources/build.sh b/ext/system-resources/build.sh index d2b28a0fb9..17c300ca4b 100644 --- a/ext/system-resources/build.sh +++ b/ext/system-resources/build.sh @@ -7,12 +7,17 @@ npm install -g npm@7.19.1 mkdir -p data # txAdmin -cd ../txAdmin/ -npm ci -npm run build -cd ../system-resources/ +MONITOR_ARTIFACT_URL="https://github.com/tabarra/txAdmin/releases/download/v7.0.0/monitor.zip" -cp -a ../txAdmin/dist data/monitor +MONITOR_PATH=data/monitor +MONITOR_ARTIFACT_PATH=data/monitor.zip + +rm -rf $MONITOR_PATH +mkdir -p $MONITOR_PATH + +curl -Lo $MONITOR_ARTIFACT_PATH $MONITOR_ARTIFACT_URL +unzip $MONITOR_ARTIFACT_PATH -d $MONITOR_PATH +rm $MONITOR_ARTIFACT_PATH # chat cd resources/chat/ diff --git a/ext/txAdmin b/ext/txAdmin deleted file mode 160000 index 361fed4796..0000000000 --- a/ext/txAdmin +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 361fed4796d229c91b00407c2df45a3aa4c761f2