Merge pull request #95 from Juesto/patch-1

make CI build vs 2015 + revert rem vpu
TF2V · Dec 1, 2024 · 529966f · 529966f
2 parents 6c1944a + 662f4eb
commit 529966f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -6,28 +6,36 @@ on:
 jobs:
   build:
     runs-on:
-      windows-2022
-    
+      windows-2019
+
     steps:
       - name: Checkout
         uses: actions/checkout@v3
         with:
           submodules: true
 
-      - name: Configure dependencies
-        uses: ilammy/msvc-dev-cmd@v1
+      - name: Install components
+        run: |
+                Set-Location "C:\Program Files (x86)\Microsoft Visual Studio\Installer\"
+                $InstallPath = "C:\Program Files\Microsoft Visual Studio\2019\Enterprise"
+                $Arguments = ('/c', "vs_installer.exe", 'modify', '--installPath', "`"$InstallPath`"", '--add', "Microsoft.VisualStudio.Component.VC.140", '--add', 'Microsoft.VisualStudio.Component.Windows81SDK','--quiet', '--norestart', '--nocache')
+                # should be run twice
+                $process = Start-Process -FilePath cmd.exe -ArgumentList $Arguments -Wait -PassThru -WindowStyle Hidden
+                $process = Start-Process -FilePath cmd.exe -ArgumentList $Arguments -Wait -PassThru -WindowStyle Hidden
 
       - name: Configure registry
         shell: powershell
         run: |
-          REG ADD "HKLM\Software\Microsoft\VisualStudio\12.0\Projects\{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}" /v "DefaultProjectExtension" /t REG_SZ  /d "vcxproj" /f /reg:32
-          REG ADD "HKLM\Software\Microsoft\VisualStudio\12.0\Projects\{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}" /v "PossibleProjectExtensions" /t REG_SZ /d "vcxproj;vcxitems;vcproj;mak" /f /reg:32
+          REG ADD "HKLM\Software\Microsoft\VisualStudio\14.0\Projects\{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}" /v "DefaultProjectExtension" /t REG_SZ  /d "vcxproj" /f /reg:32
+          REG ADD "HKLM\Software\Microsoft\VisualStudio\14.0\Projects\{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}" /v "PossibleProjectExtensions" /t REG_SZ /d "vcxproj;vcxitems;vcproj;mak" /f /reg:32
+
+      - name: Configure dependencies
+        uses: ilammy/msvc-dev-cmd@v1
 
       - name: Create project
         run: |
           cd src
-          devtools/bin/vpc.exe /tf2vintage /2015 +game /mksln TF2vintage.sln
-          devtools/bin/vpu.exe /2019 TF2vintage.sln
+          devtools/bin/vpc.exe /tf2vintage +game /mksln TF2vintage.sln
 
       - name: Build project
         run: cd src;devenv TF2vintage.sln /Build Release

diff --git a/src/createtf2vintage.bat b/src/createtf2vintage.bat
@@ -1,2 +1,2 @@
 devtools\bin\vpc.exe /tf2vintage /2015 +game /mksln TF2vintage.sln
-rem devtools\bin\vpu.exe /2019 /cxx17 TF2vintage.sln
+devtools\bin\vpu.exe /2019 /cxx17 TF2vintage.sln