Skip to content

Commit d0db14a

Browse files
committed
Simplify CI to use Windows 2025 runner with VS2026 natively
1 parent ba05b6b commit d0db14a

2 files changed

Lines changed: 6 additions & 7 deletions

File tree

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66

77
jobs:
88
build:
9-
runs-on: windows-latest
9+
runs-on: windows-2025
1010

1111
steps:
1212
- name: Checkout repository
@@ -39,7 +39,7 @@ jobs:
3939
uses: microsoft/setup-msbuild@v2
4040

4141
- name: Build solution
42-
run: msbuild ./projects/spectrum_vs2022.sln /p:Configuration=Retail /p:Platform=x64 /m
42+
run: msbuild ./projects/spectrum.sln /p:Configuration=Retail /p:Platform=x64 /m
4343

4444
- name: Upload build artifacts
4545
uses: actions/upload-artifact@v4

main.sharpmake.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public Common() : base(typeof(CustomTarget))
4141
AddTargets(new CustomTarget
4242
{
4343
Platform = Platform.win64,
44-
DevEnv = DevEnv.vs2026 | DevEnv.vs2022,
44+
DevEnv = DevEnv.vs2026,
4545
Optimization = Optimization.Release,
4646
Mode = Mode.Debug | Mode.Profile | Mode.Retail
4747
});
@@ -60,8 +60,8 @@ public virtual void ConfigureAll(Configuration conf, CustomTarget target)
6060
{
6161
conf.Output = Configuration.OutputType.Utility;
6262

63-
string devEnvSuffix = target.DevEnv == DevEnv.vs2022 ? "_vs2022" : "";
64-
conf.ProjectFileName = $"[project.Name]{devEnvSuffix}";
63+
64+
conf.ProjectFileName = "[project.Name]";
6565
conf.ProjectPath = @"[project.RootPath]";
6666

6767
conf.IncludePaths.Add(SourceRootPath);
@@ -400,8 +400,7 @@ public SpectrumSolution()
400400
[Configure()]
401401
public void ConfigureAll(Configuration conf, CustomTarget target)
402402
{
403-
string solutionNameSuffix = target.DevEnv == DevEnv.vs2022 ? "_vs2022" : "";
404-
conf.SolutionFileName = $"Spectrum{solutionNameSuffix}";
403+
conf.SolutionFileName = "Spectrum";
405404
conf.SolutionPath = @"[solution.SharpmakeCsPath]\projects\";
406405
string platformName = string.Empty;
407406
/*

0 commit comments

Comments
 (0)