From 2c4a3d79678ac3220337932b329f577e0b76147a Mon Sep 17 00:00:00 2001
From: Jordan Dominion <Cyberboss@users.noreply.github.com>
Date: Tue, 13 Aug 2024 23:12:55 -0400
Subject: [PATCH] Enable corepack on command line. Fix missed telemetry build
 in Windows .exe deployment

---
 .github/CONTRIBUTING.md                       |  2 +
 .github/workflows/ci-pipeline.yml             | 38 ++++++++++++++-----
 .../Tgstation.Server.Host.csproj              |  5 +--
 3 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 233c7fb51e..1c6c65e278 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -36,6 +36,8 @@ You can of course, as always, ask for help at [#coderbus](irc://irc.rizon.net/co
 
 You need the .NET 8.0 SDK, node>=v20, and npm>=v5.7 (in your PATH) to compile the server. On Linux, you also need the `libgdiplus` package installed to generate icons.
 
+You need to run `corepack enable` to configure node to correctly build the webpanel.
+
 The recommended IDE is Visual Studio 2022 or VSCode.
 
 In order to build the service version and/or the Windows installer you need a to run on Windows.
diff --git a/.github/workflows/ci-pipeline.yml b/.github/workflows/ci-pipeline.yml
index 375fb7dc40..a3ec6a8c18 100644
--- a/.github/workflows/ci-pipeline.yml
+++ b/.github/workflows/ci-pipeline.yml
@@ -475,6 +475,9 @@ jobs:
     - name: Restore
       run: dotnet restore
 
+    - name: Enable Corepack
+      run: corepack enable
+
     - name: Build
       run: dotnet build -c ${{ matrix.configuration }}NoWindows
 
@@ -526,6 +529,9 @@ jobs:
     - name: Restore
       run: dotnet restore
 
+    - name: Enable Corepack
+      run: corepack enable
+
     - name: Build
       run: dotnet build -c ${{ matrix.configuration }}NoWix
 
@@ -644,6 +650,9 @@ jobs:
     - name: Restore
       run: dotnet restore
 
+    - name: Enable Corepack
+      run: corepack enable
+
     - name: Setup Telemetry Key File
       shell: bash
       run: echo "${{ secrets.TGS_TELEMETRY_KEY }}" > ${{ env.TGS_TELEMETRY_KEY_FILE }}
@@ -861,6 +870,9 @@ jobs:
     - name: Restore
       run: dotnet restore
 
+    - name: Enable Corepack
+      run: corepack enable
+
     - name: Setup Telemetry Key File
       run: echo "${{ secrets.TGS_TELEMETRY_KEY }}" > ${{ env.TGS_TELEMETRY_KEY_FILE }}
 
@@ -1327,8 +1339,6 @@ jobs:
     needs: start-ci-run-gate
     runs-on: windows-latest
     if: (!(cancelled() || failure()) && needs.start-ci-run-gate.result == 'success')
-    env:
-      TGS_TELEMETRY_KEY_FILE: C:/tgs_telemetry_key.txt
     steps:
     - name: Install winget
       uses: Cyberboss/install-winget@v1
@@ -1362,18 +1372,12 @@ jobs:
     - name: Restore
       run: dotnet restore
 
-    - name: Setup Telemetry Key File
-      shell: bash
-      run: echo "${{ secrets.TGS_TELEMETRY_KEY }}" > ${{ env.TGS_TELEMETRY_KEY_FILE }}
+    - name: Enable Corepack
+      run: corepack enable
 
     - name: Build Host
       run: dotnet build -c Release src/Tgstation.Server.Host/Tgstation.Server.Host.csproj
 
-    - name: Delete Telemetry Key File
-      shell: bash
-      if: always()
-      run: rm ${{ env.TGS_TELEMETRY_KEY_FILE }}
-
     - name: Build Service
       run: dotnet build -c Release src/Tgstation.Server.Host.Service/Tgstation.Server.Host.Service.csproj
 
@@ -1769,6 +1773,8 @@ jobs:
     needs: [deploy-dm, deploy-http, deployment-gate]
     runs-on: windows-latest
     if: (!(cancelled() || failure()) && needs.deployment-gate.result == 'success' && github.event.ref == 'refs/heads/master' && contains(github.event.head_commit.message, '[TGSDeploy]'))
+    env:
+      TGS_TELEMETRY_KEY_FILE: C:/tgs_telemetry_key.txt
     steps:
     - name: Setup dotnet
       uses: actions/setup-dotnet@v4
@@ -1789,9 +1795,21 @@ jobs:
 
 # We need to rebuild the installer.exe so it can be properly signed
 
+    - name: Enable Corepack
+      run: corepack enable
+
+    - name: Setup Telemetry Key File
+      shell: bash
+      run: echo "${{ secrets.TGS_TELEMETRY_KEY }}" > ${{ env.TGS_TELEMETRY_KEY_FILE }}
+
     - name: Build Host
       run: dotnet build -c Release src/Tgstation.Server.Host/Tgstation.Server.Host.csproj
 
+    - name: Delete Telemetry Key File
+      shell: bash
+      if: always()
+      run: rm ${{ env.TGS_TELEMETRY_KEY_FILE }}
+
     - name: Build Service
       run: dotnet build -c Release src/Tgstation.Server.Host.Service/Tgstation.Server.Host.Service.csproj
 
diff --git a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj
index 9e19034512..999dff04a8 100644
--- a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj
+++ b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj
@@ -29,14 +29,13 @@
     <Exec Command="git clone https://github.com/tgstation/tgstation-server-webpanel --branch v$(TgsWebpanelVersion) --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 corepack enable" />
-    <Exec WorkingDirectory="ClientApp" Command="npx yarn install --immutable" />
+    <Exec WorkingDirectory="ClientApp" Command="yarn install --immutable" />
     <Touch Files="$(NpmInstallStampFile)" AlwaysCreate="true" />
   </Target>
 
   <Target Condition="'$(TGS_HOST_NO_WEBPANEL)' != 'true'" Name="NpmBuild" BeforeTargets="BeforeBuild" DependsOnTargets="ClientInstall" Inputs="../../build/WebpanelVersion.props" Outputs="wwwroot\index.html">
     <Message Text="Building web control panel..." Importance="high" />
-    <Exec WorkingDirectory="ClientApp" Command="npx yarn run msbuild" />
+    <Exec WorkingDirectory="ClientApp" Command="yarn run msbuild" />
   </Target>
 
   <Target Name="NpmClean" AfterTargets="Clean">