mirror of
https://github.com/tgstation/tgstation-server.git
synced 2026-08-29 08:00:19 +01:00
Pin yarn@1.22.19
Workaround for https://github.com/yarnpkg/yarn/issues/9011
This commit is contained in:
@@ -19,9 +19,6 @@ RUN . $NVM_DIR/nvm.sh \
|
||||
&& rm -rf /var/lib/apt/lists/* \
|
||||
&& npm install -g npm
|
||||
|
||||
#You may wonder why this needs to be in a seperate step. I don't know... It just works(tm)
|
||||
RUN npm install -g yarn
|
||||
|
||||
# Build web control panel
|
||||
WORKDIR /repo/build
|
||||
|
||||
|
||||
@@ -19,5 +19,6 @@
|
||||
<!-- Update this frequently with dotnet runtime patches. MAJOR MUST MATCH ABOVE! -->
|
||||
<TgsDotnetRedistUrl>https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/6.0.24/dotnet-hosting-6.0.24-win.exe</TgsDotnetRedistUrl>
|
||||
<TgsMariaDBRedistVersion>10.11.6</TgsMariaDBRedistVersion>
|
||||
<TgsYarnVersion>1.22.19</TgsYarnVersion>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
<!-- This is here because I know we have node as a build dep so this just works -->
|
||||
<Target Name="IconGeneration" BeforeTargets="ResolveAssemblyReferences" Inputs="build_logo.js;../../build/logo.svg" Outputs="../../artifacts/tgs.ico;../../artifacts/tgs.png">
|
||||
<Message Text="Restoring yarn packages..." Importance="high" />
|
||||
<Exec Command="npx --yes yarn add svg-to-ico@1.0.14 svg2img@1.0.0-beta.2" />
|
||||
<Exec Command="npx --yes yarn@$(TgsYarnVersion) add svg-to-ico@1.0.14 svg2img@1.0.0-beta.2" />
|
||||
<Message Text="Generating icons from SVG..." Importance="high" />
|
||||
<Exec Command="node ./build_logo.js" />
|
||||
</Target>
|
||||
|
||||
@@ -28,13 +28,13 @@
|
||||
<Exec Command="git clone https://github.com/tgstation/tgstation-server-webpanel --branch v$(TgsControlPanelVersion) --depth 1 ClientApp" />
|
||||
<RemoveDir Directories="ClientApp/.git" /> <!-- Allows git clean to clean it out -->
|
||||
<Message Text="Restoring yarn packages..." Importance="high" />
|
||||
<Exec WorkingDirectory="ClientApp" Command="npx --yes yarn install --immutable" />
|
||||
<Exec WorkingDirectory="ClientApp" Command="npx --yes yarn@$(TgsYarnVersion) install --immutable" />
|
||||
<Touch Files="$(NpmInstallStampFile)" AlwaysCreate="true" />
|
||||
</Target>
|
||||
|
||||
<Target Condition="'$(TGS_HOST_NO_WEBPANEL)' != 'true'" Name="NpmBuild" BeforeTargets="BeforeBuild" DependsOnTargets="ClientInstall" Inputs="../../build/ControlPanelVersion.props" Outputs="wwwroot\index.html">
|
||||
<Message Text="Building web control panel..." Importance="high" />
|
||||
<Exec WorkingDirectory="ClientApp" Command="npx --yes yarn run msbuild" />
|
||||
<Exec WorkingDirectory="ClientApp" Command="npx --yes yarn@$(TgsYarnVersion) run msbuild" />
|
||||
</Target>
|
||||
|
||||
<Target Name="NpmClean" AfterTargets="Clean">
|
||||
|
||||
Reference in New Issue
Block a user