Merge branch 'mr-164'

citizenfx · Dec 19, 2023 · a3dd945 · a3dd945
2 parents bc9954d + 8608d64
commit a3dd945
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/code/tools/ci/psm1/cfxVersions.psm1 b/code/tools/ci/psm1/cfxVersions.psm1
@@ -101,7 +101,8 @@ function Get-CfxVersions {
         $versions.UI = ((git rev-list $versions.UICommit | measure-object).Count * 10) + 1100000
 
         $SystemResourcesPaths = @(
-            "ext/system-resources/"
+            "ext/txAdmin"
+            "ext/system-resources"
         )
         $versions.SystemResourcesCommit = (git rev-list -1 HEAD $SystemResourcesPaths)
         $versions.SystemResources = ((git rev-list $versions.SystemResourcesCommit | measure-object).Count * 10) + 1100000

diff --git a/ext/system-resources/build.cmd b/ext/system-resources/build.cmd
@@ -33,9 +33,12 @@ rmdir /s /q dist
 
 node %~dp0\..\native-doc-gen\yarn_cli.js
 
-:: TODO: only do this if node 18
-set NODE_OPTIONS=--openssl-legacy-provider
-call node_modules\.bin\webpack
+set NODE_OPTIONS=""
+FOR /F %%g IN ('node -v') do (set NODE_VERSION_STRING=%%g)
+set /a NODE_VERSION="%NODE_VERSION_STRING:~1,2%"
+IF %NODE_VERSION% GEQ 18 (set NODE_OPTIONS=--openssl-legacy-provider)
+
+call node_modules\.bin\webpack.cmd
 popd
 
 rmdir /s /q %SRRoot%\chat\