Skip to content

Commit 23f2a30

Browse files
committed
1 parent 2fba0f4 commit 23f2a30

File tree

4 files changed

+4
-6
lines changed

4 files changed

+4
-6
lines changed

build/Dockerfile

-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ RUN . $NVM_DIR/nvm.sh \
1919
&& rm -rf /var/lib/apt/lists/* \
2020
&& npm install -g npm
2121

22-
#You may wonder why this needs to be in a seperate step. I don't know... It just works(tm)
23-
RUN npm install -g yarn
24-
2522
# Build web control panel
2623
WORKDIR /repo/build
2724

build/Version.props

+1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
<!-- Update this frequently with dotnet runtime patches. MAJOR MUST MATCH ABOVE! -->
2020
<TgsDotnetRedistUrl>https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/6.0.24/dotnet-hosting-6.0.24-win.exe</TgsDotnetRedistUrl>
2121
<TgsMariaDBRedistVersion>10.11.6</TgsMariaDBRedistVersion>
22+
<TgsYarnVersion>1.22.19</TgsYarnVersion>
2223
</PropertyGroup>
2324
</Project>

src/Tgstation.Server.Common/Tgstation.Server.Common.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<!-- This is here because I know we have node as a build dep so this just works -->
1818
<Target Name="IconGeneration" BeforeTargets="ResolveAssemblyReferences" Inputs="build_logo.js;../../build/logo.svg" Outputs="../../artifacts/tgs.ico;../../artifacts/tgs.png">
1919
<Message Text="Restoring yarn packages..." Importance="high" />
20-
<Exec Command="npx --yes yarn add [email protected] [email protected]" />
20+
<Exec Command="npx --yes yarn@$(TgsYarnVersion) add [email protected] [email protected]" />
2121
<Message Text="Generating icons from SVG..." Importance="high" />
2222
<Exec Command="node ./build_logo.js" />
2323
</Target>

src/Tgstation.Server.Host/Tgstation.Server.Host.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@
2828
<Exec Command="git clone https://github.com/tgstation/tgstation-server-webpanel --branch v$(TgsControlPanelVersion) --depth 1 ClientApp" />
2929
<RemoveDir Directories="ClientApp/.git" /> <!-- Allows git clean to clean it out -->
3030
<Message Text="Restoring yarn packages..." Importance="high" />
31-
<Exec WorkingDirectory="ClientApp" Command="npx --yes yarn install --immutable" />
31+
<Exec WorkingDirectory="ClientApp" Command="npx --yes yarn@$(TgsYarnVersion) install --immutable" />
3232
<Touch Files="$(NpmInstallStampFile)" AlwaysCreate="true" />
3333
</Target>
3434

3535
<Target Condition="'$(TGS_HOST_NO_WEBPANEL)' != 'true'" Name="NpmBuild" BeforeTargets="BeforeBuild" DependsOnTargets="ClientInstall" Inputs="../../build/ControlPanelVersion.props" Outputs="wwwroot\index.html">
3636
<Message Text="Building web control panel..." Importance="high" />
37-
<Exec WorkingDirectory="ClientApp" Command="npx --yes yarn run msbuild" />
37+
<Exec WorkingDirectory="ClientApp" Command="npx --yes yarn@$(TgsYarnVersion) run msbuild" />
3838
</Target>
3939

4040
<Target Name="NpmClean" AfterTargets="Clean">

0 commit comments

Comments
 (0)