diff --git a/.github/workflows/ci-pipeline.yml b/.github/workflows/ci-pipeline.yml index 93dc8e3c01..bcca5496c9 100644 --- a/.github/workflows/ci-pipeline.yml +++ b/.github/workflows/ci-pipeline.yml @@ -1369,7 +1369,7 @@ jobs: - name: Test Install run: | sudo mkdir /etc/tgstation-server - sudo cp build/package/appsettings.GitHub.yml /etc/tgstation-server/appsettings.Production.yml + sudo cp build/package/deb/appsettings.GitHub.yml /etc/tgstation-server/appsettings.Production.yml sudo apt-get install -y ./tgstation-server_${{ env.TGS_VERSION }}-1_amd64.deb sudo ls -al /etc/tgstation-server sudo cat /etc/tgstation-server/appsettings.Production.yml @@ -1514,7 +1514,7 @@ jobs: shell: powershell # If it's missing, I found that in elements were the problem run: | mkdir C:/ProgramData/tgstation-server - cp build/package/appsettings.GitHub.yml C:/ProgramData/tgstation-server/appsettings.Production.yml + cp build/package/winget/appsettings.GitHub.yml C:/ProgramData/tgstation-server/appsettings.Production.yml $file = [System.IO.Path]::GetFullPath("build/package/winget/test-installer.exe") $log = [System.IO.Path]::GetFullPath("install.log") $procMain = Start-Process -FilePath $file "/install /silent /log `"$log`"" -NoNewWindow -PassThru -Wait diff --git a/build/package/deb/appsettings.GitHub.yml b/build/package/deb/appsettings.GitHub.yml new file mode 100644 index 0000000000..ae79a502fc --- /dev/null +++ b/build/package/deb/appsettings.GitHub.yml @@ -0,0 +1,26 @@ +# Barebones config file used for testing service installs in GitHub actions +Database: + DatabaseType: Sqlite + ConnectionString: Data Source=/home/tgstation-server/tgs.sqlite3;Mode=ReadWriteCreate +General: + ConfigVersion: 4.6.0 + ApiPort: 5000 + GitHubAccessToken: + SetupWizardMode: Never + ByondTopicTimeout: 5000 + RestartTimeoutMinutes: 1 + ShutdownTimeoutMinutes: 300 + UseBasicWatchdog: false + HostApiDocumentation: true + SkipAddingByondFirewallException: false + DeploymentDirectoryCopyTasksPerCore: + MinimumPasswordLength: 15 + InstanceLimit: 10 + UserLimit: 100 + UserGroupLimit: 25 + ValidInstancePaths: +FileLogging: + Directory: + Disable: false + LogLevel: Trace + MicrosoftLogLevel: Warning diff --git a/build/package/appsettings.GitHub.yml b/build/package/winget/appsettings.GitHub.yml similarity index 100% rename from build/package/appsettings.GitHub.yml rename to build/package/winget/appsettings.GitHub.yml diff --git a/tgstation-server.sln b/tgstation-server.sln index d34815bd30..31d15d0159 100644 --- a/tgstation-server.sln +++ b/tgstation-server.sln @@ -219,6 +219,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "package", "package", "{2648 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "deb", "deb", "{457A1F89-6201-4430-BCC6-2F4438A54B9E}" ProjectSection(SolutionItems) = preProject + build\package\deb\appsettings.GitHub.yml = build\package\deb\appsettings.GitHub.yml build\package\deb\build_package.sh = build\package\deb\build_package.sh build\package\deb\install_artifacts.sh = build\package\deb\install_artifacts.sh build\package\deb\MakeInstall = build\package\deb\MakeInstall @@ -244,6 +245,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "upstream", "upstream", "{B4 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "winget", "winget", "{506B9092-AF88-4DA2-84FD-C11646B695B0}" ProjectSection(SolutionItems) = preProject + build\package\winget\appsettings.GitHub.yml = build\package\winget\appsettings.GitHub.yml build\package\winget\install_banner.jpg = build\package\winget\install_banner.jpg build\package\winget\prepare_installer_input_artifacts.ps1 = build\package\winget\prepare_installer_input_artifacts.ps1 build\package\winget\push_manifest.ps1 = build\package\winget\push_manifest.ps1