From cc7b4994f52d6d73935061f8dc1a93e081b19dbe Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Sun, 12 Jul 2026 11:18:27 +0100 Subject: [PATCH] Use Docker to build linux binaries --- .github/workflows/main.yml | 2 +- build/BuildLinuxTask.cs | 4 ++-- buildscripts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cc2e77e..1c4d1f0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,7 +9,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [windows-latest, macos-latest, ubuntu-22.04, ubuntu-22.04-arm] + os: [windows-2022, macos-latest, ubuntu-22.04, ubuntu-22.04-arm] fail-fast: false steps: - name: Expose GitHub Runtime diff --git a/build/BuildLinuxTask.cs b/build/BuildLinuxTask.cs index 858421e..a4f15dd 100644 --- a/build/BuildLinuxTask.cs +++ b/build/BuildLinuxTask.cs @@ -15,8 +15,8 @@ public override void Run(BuildContext context) context.ReplaceTextInFiles("freetype/meson.build", "meson.override_dependency('freetype2', freetype_dep)", ""); // Build - context.StartProcess("meson", new ProcessSettings { WorkingDirectory = "freetype", Arguments = "setup -Ddefault_library=shared -Dbzip2=disabled --force-fallback-for=libpng,harfbuzz,zlib builddir" }); - context.StartProcess("meson", new ProcessSettings { WorkingDirectory = "freetype", Arguments = "compile -C builddir" }); + context.StartProcessWithDocker("meson", workingDirectory: "freetype", args: "setup -Ddefault_library=shared -Dbzip2=disabled --force-fallback-for=libpng,harfbuzz,zlib builddir"); + context.StartProcessWithDocker("meson", workingDirectory: "freetype", args: "compile -C builddir"); foreach (var filePath in Directory.GetFiles("freetype/builddir")) { diff --git a/buildscripts b/buildscripts index 43f13de..85bd209 160000 --- a/buildscripts +++ b/buildscripts @@ -1 +1 @@ -Subproject commit 43f13de8d1dd568f35eb9fe665fe4824e90a437d +Subproject commit 85bd2099140060dba373744e02282525aa8e876c