From b663b3b7dceb3f61ca2e121549c3cd594cc76580 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Tue, 12 Sep 2023 23:36:09 -0400 Subject: [PATCH 1/4] Integrate new SVG icon into build pipeline Uploading generated tgs.png to my personal Discord for hosting purposes. Using logo source commit of 7d202238c58d8f8d1de74fe7ccf04fc1703a9bac for new Discord embed logo --- .gitignore | 3 ++ build/NugetCommon.props | 2 +- build/package/deb/MakeInstall | 2 + .../Bundle.wxs | 4 +- .../Package.wxs | 2 +- .../Tgstation.Server.Host.Service.Wix.wixproj | 2 +- .../prepare_installer_input_artifacts.ps1 | 6 ++- build/tgs.ico | Bin 123198 -> 0 bytes build/tgs.png | Bin 5150 -> 0 bytes .../Tgstation.Server.Common.csproj | 17 ++++++++ src/Tgstation.Server.Common/build_logo.js | 40 ++++++++++++++++++ .../Tgstation.Server.Host.Service.csproj | 2 +- .../Chat/Providers/DiscordProvider.cs | 2 +- tgstation-server.sln | 3 +- 14 files changed, 75 insertions(+), 10 deletions(-) delete mode 100644 build/tgs.ico delete mode 100644 build/tgs.png create mode 100644 src/Tgstation.Server.Common/build_logo.js diff --git a/.gitignore b/.gitignore index 0c71765597..770d2a28d4 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,6 @@ changelog.yml *nupkg *.sqlite3 packaging/ +/src/Tgstation.Server.Common/node_modules +/src/Tgstation.Server.Common/package.json +/src/Tgstation.Server.Common/yarn.lock diff --git a/build/NugetCommon.props b/build/NugetCommon.props index 23e6a4d258..d1c341efd0 100644 --- a/build/NugetCommon.props +++ b/build/NugetCommon.props @@ -31,6 +31,6 @@ - + diff --git a/build/package/deb/MakeInstall b/build/package/deb/MakeInstall index f0d34e6963..206d7c1f9a 100755 --- a/build/package/deb/MakeInstall +++ b/build/package/deb/MakeInstall @@ -1,6 +1,8 @@ #!/usr/bin/make -f install: + rm artifacts/tgs.png + rm artifacts/tgs.ico build/package/deb/install_artifacts.sh "$(DESTDIR)" install -D build/package/appsettings.Initial.yml "$(DESTDIR)/etc/tgstation-server/appsettings.Production.yml" install src/Tgstation.Server.Host/appsettings.yml "$(DESTDIR)/etc/tgstation-server/appsettings.yml" diff --git a/build/package/winget/Tgstation.Server.Host.Service.Wix.Bundle/Bundle.wxs b/build/package/winget/Tgstation.Server.Host.Service.Wix.Bundle/Bundle.wxs index a25525c3c1..91fdc8cec7 100644 --- a/build/package/winget/Tgstation.Server.Host.Service.Wix.Bundle/Bundle.wxs +++ b/build/package/winget/Tgstation.Server.Host.Service.Wix.Bundle/Bundle.wxs @@ -1,7 +1,7 @@ - + - + diff --git a/build/package/winget/Tgstation.Server.Host.Service.Wix/Package.wxs b/build/package/winget/Tgstation.Server.Host.Service.Wix/Package.wxs index 95da39d252..240250b62f 100644 --- a/build/package/winget/Tgstation.Server.Host.Service.Wix/Package.wxs +++ b/build/package/winget/Tgstation.Server.Host.Service.Wix/Package.wxs @@ -11,7 +11,7 @@ - + diff --git a/build/package/winget/Tgstation.Server.Host.Service.Wix/Tgstation.Server.Host.Service.Wix.wixproj b/build/package/winget/Tgstation.Server.Host.Service.Wix/Tgstation.Server.Host.Service.Wix.wixproj index a3aa164719..f03f8f41b2 100644 --- a/build/package/winget/Tgstation.Server.Host.Service.Wix/Tgstation.Server.Host.Service.Wix.wixproj +++ b/build/package/winget/Tgstation.Server.Host.Service.Wix/Tgstation.Server.Host.Service.Wix.wixproj @@ -31,4 +31,4 @@ - \ No newline at end of file + diff --git a/build/package/winget/prepare_installer_input_artifacts.ps1 b/build/package/winget/prepare_installer_input_artifacts.ps1 index d73f0d3001..b2a5c6b4d7 100644 --- a/build/package/winget/prepare_installer_input_artifacts.ps1 +++ b/build/package/winget/prepare_installer_input_artifacts.ps1 @@ -26,7 +26,11 @@ try $ProgressPreference = $previousProgressPreference } - cd src/Tgstation.Server.Host + # Generating icons + Set-Location src/Tgstation.Server.Common + dotnet msbuild -t:IconGeneration + + Set-Location ../Tgstation.Server.Host dotnet publish -c Release --no-build -o ../../artifacts/Tgstation.Server.Host if (-Not $?) { exit $lastexitcode diff --git a/build/tgs.ico b/build/tgs.ico deleted file mode 100644 index 6ed69fadfcdf8deb049f66dfffc46d5361332feb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 123198 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 + + + + + + + + + + + + + + + + + diff --git a/src/Tgstation.Server.Common/build_logo.js b/src/Tgstation.Server.Common/build_logo.js new file mode 100644 index 0000000000..caf3f2eb7b --- /dev/null +++ b/src/Tgstation.Server.Common/build_logo.js @@ -0,0 +1,40 @@ +// Prereq packages: svg-to-ico@1.0.14 svg2img@1.0.0-beta.2 +// Usage: node ./build_logo.js +// Generates ../../artifacts/tgs.ico and ../../artifacts/tgs.ico + +const svg_to_img = require("svg-to-ico"); +const svg2img = require('svg2img'); +const fs = require('fs'); +const { exit } = require("process"); +if (!fs.existsSync("../../artifacts")) { + fs.mkdirSync("../../artifacts",'0777', true); +} + +svg_to_img({ + input_name: "../../build/logo.svg", + output_name: "../../artifacts/tgs.ico", + sizes: [ 160 ] +}).then(() => { + // this package sucks, path separators are fucked + svg2img( + "../../build/logo.svg", + { + resvg: { + fitTo: { + mode: 'width', // or height + value: 64, + } + } + }, + function(error, buffer) { + if(error) { + console.error(`PNG conversion failed: ${error}`); + exit(2); + } + + fs.writeFileSync("../../artifacts/tgs.png", buffer); + }); +}).catch((error) => { + console.error(`ICO conversion failed: ${error}`); + exit(1); +}); diff --git a/src/Tgstation.Server.Host.Service/Tgstation.Server.Host.Service.csproj b/src/Tgstation.Server.Host.Service/Tgstation.Server.Host.Service.csproj index 0186298b28..62ef77cf57 100644 --- a/src/Tgstation.Server.Host.Service/Tgstation.Server.Host.Service.csproj +++ b/src/Tgstation.Server.Host.Service/Tgstation.Server.Host.Service.csproj @@ -9,7 +9,7 @@ $(TgsCoreVersion) false - ../../build/tgs.ico + ../../artifacts/tgs.ico ../../build/uac_elevation_manifest.xml diff --git a/src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs b/src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs index 3ef92357d8..d9d41273e4 100644 --- a/src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs +++ b/src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs @@ -349,7 +349,7 @@ namespace Tgstation.Server.Host.Components.Chat.Providers var author = new EmbedAuthor(assemblyInformationProvider.VersionPrefix) { Url = "https://github.com/tgstation/tgstation-server", - IconUrl = "https://avatars0.githubusercontent.com/u/1363778?s=280&v=4", + IconUrl = "https://cdn.discordapp.com/attachments/1114451486374637629/1151650846019432448/tgs.png", }; var embed = new Embed { diff --git a/tgstation-server.sln b/tgstation-server.sln index 4f98dc2080..6d183435b8 100644 --- a/tgstation-server.sln +++ b/tgstation-server.sln @@ -29,14 +29,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{6FF654E6 build\ControlPanelVersion.props = build\ControlPanelVersion.props build\Dockerfile = build\Dockerfile build\GenerateMigrations.sh = build\GenerateMigrations.sh + build\logo.svg = build\logo.svg build\NugetCommon.props = build\NugetCommon.props build\OpenApiValidationSettings.json = build\OpenApiValidationSettings.json build\SrcCommon.props = build\SrcCommon.props build\stylecop.json = build\stylecop.json build\TestCommon.props = build\TestCommon.props build\tgs.docker.sh = build\tgs.docker.sh - build\tgs.ico = build\tgs.ico - build\tgs.png = build\tgs.png build\tgstation-server.service = build\tgstation-server.service build\uac_elevation_manifest.xml = build\uac_elevation_manifest.xml build\Version.props = build\Version.props From fb068686ec2f17da1f7c8440cd9a1e9ea25090e8 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Tue, 12 Sep 2023 23:36:43 -0400 Subject: [PATCH 2/4] Bump to latest web control panel version --- build/ControlPanelVersion.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ControlPanelVersion.props b/build/ControlPanelVersion.props index ce868e2875..375980c502 100644 --- a/build/ControlPanelVersion.props +++ b/build/ControlPanelVersion.props @@ -1,6 +1,6 @@ - 4.24.0 + 4.25.2 From 3541fd7d49427dac31f4b070c772b428f68835c6 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Tue, 12 Sep 2023 23:37:07 -0400 Subject: [PATCH 3/4] Version bump to 5.16.0 --- build/Version.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Version.props b/build/Version.props index 7b11cf0938..4dd29db8a0 100644 --- a/build/Version.props +++ b/build/Version.props @@ -3,7 +3,7 @@ - 5.15.1 + 5.16.0 4.7.1 9.12.0 6.0.1 From 6328674fa7075b2997556587212896c0e0437cb8 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Thu, 14 Sep 2023 09:26:46 -0400 Subject: [PATCH 4/4] Fix path to icon in Windows bundle --- .../winget/Tgstation.Server.Host.Service.Wix.Bundle/Bundle.wxs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/package/winget/Tgstation.Server.Host.Service.Wix.Bundle/Bundle.wxs b/build/package/winget/Tgstation.Server.Host.Service.Wix.Bundle/Bundle.wxs index 91fdc8cec7..9caccc81ae 100644 --- a/build/package/winget/Tgstation.Server.Host.Service.Wix.Bundle/Bundle.wxs +++ b/build/package/winget/Tgstation.Server.Host.Service.Wix.Bundle/Bundle.wxs @@ -1,5 +1,5 @@ - +