Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [windows-latest, macos-latest, ubuntu-22.04]
os: [windows-latest, macos-latest, ubuntu-22.04, ubuntu-22.04-arm]
fail-fast: false
steps:
- name: Expose GitHub Runtime
Expand Down
15 changes: 12 additions & 3 deletions build/BuildWindowsTask.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,15 @@ public sealed class BuildWindowsTask : FrostingTask<BuildContext>

public override void Run(BuildContext context)
{
var buildWorkingDir = "mojoshaderbuild/";
BuildForArchitecture(context, "x64", "x64");
BuildForArchitecture(context, "ARM64", "arm64");
}

private void BuildForArchitecture(BuildContext context, string arch, string rid)
{
var buildWorkingDir = $"mojoshaderbuild-{rid}/";
context.CreateDirectory(buildWorkingDir);
context.StartProcess("cmake", new ProcessSettings { WorkingDirectory = buildWorkingDir, Arguments = "../mojoshader/CMakeLists.txt" });
context.StartProcess("cmake", new ProcessSettings { WorkingDirectory = buildWorkingDir, Arguments = $"-A {arch} ../mojoshader/CMakeLists.txt" });

// Fix generated projects using the same obj folder
var dirProps = @"
Expand All @@ -29,6 +35,9 @@ public override void Run(BuildContext context)
context.ReplaceTextInFiles(System.IO.Path.Combine(buildWorkingDir, "mojoshader.vcxproj"), "MultiThreadedDLL", "MultiThreaded");

context.StartProcess("cmake", new ProcessSettings { WorkingDirectory = buildWorkingDir, Arguments = "--build . --config release" });
context.CopyFile(System.IO.Path.Combine(buildWorkingDir, "Release", "mojoshader.dll"), $"{context.ArtifactsDir}/mojoshader.dll");

var outputDir = $"{context.ArtifactsDir}/win-{rid}";
context.CreateDirectory(outputDir);
context.CopyFile(System.IO.Path.Combine(buildWorkingDir, "Release", "mojoshader.dll"), $"{outputDir}/mojoshader.dll");
}
}
Loading