Update Jenkinsfile and Windows installer configuration
Some checks failed
farmcontrol/farmcontrol-server/pipeline/head There was a failure building this commit

- Changed the build discard policy in Jenkinsfile from 20 to 10 builds to optimize storage.
- Refactored the farmcontrol-server.wxs file to rename the main setup component and separate SetupArchive and SetupMetadata into distinct components for improved clarity and management in the MSI packaging process.
This commit is contained in:
Tom Butcher 2026-08-01 20:13:49 +01:00
parent d867d017bb
commit f21224becc
2 changed files with 11 additions and 5 deletions

2
Jenkinsfile vendored
View File

@ -1,5 +1,5 @@
properties([ properties([
buildDiscarder(logRotator(numToKeepStr: '20')) buildDiscarder(logRotator(numToKeepStr: '10'))
]) ])
def bunBinDir() { def bunBinDir() {

View File

@ -24,15 +24,21 @@
</Directory> </Directory>
<DirectoryRef Id="INSTALLFOLDER"> <DirectoryRef Id="INSTALLFOLDER">
<Component Id="SetupComponent" Guid="*"> <Component Id="SetupExeComponent" Guid="*">
<File Id="SetupExe" Source="$(var.SetupExe)" KeyPath="yes" /> <File Id="SetupExe" Source="$(var.SetupExe)" KeyPath="yes" />
<File Id="SetupArchive" Source="$(var.SetupArchive)" /> </Component>
<File Id="SetupMetadata" Source="$(var.SetupMetadata)" /> <Component Id="SetupArchiveComponent" Guid="*">
<File Id="SetupArchive" Source="$(var.SetupArchive)" KeyPath="yes" />
</Component>
<Component Id="SetupMetadataComponent" Guid="*">
<File Id="SetupMetadata" Source="$(var.SetupMetadata)" KeyPath="yes" />
</Component> </Component>
</DirectoryRef> </DirectoryRef>
<Feature Id="MainFeature" Title="Farm Control Server" Level="1"> <Feature Id="MainFeature" Title="Farm Control Server" Level="1">
<ComponentRef Id="SetupComponent" /> <ComponentRef Id="SetupExeComponent" />
<ComponentRef Id="SetupArchiveComponent" />
<ComponentRef Id="SetupMetadataComponent" />
</Feature> </Feature>
<CustomAction <CustomAction