From f117b76129a75e4197179bdf2153647432471832 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Thu, 28 Oct 2021 13:03:32 +0200 Subject: [PATCH] XMake: Fix 2.5.9/dev handling --- .github/workflows/windows-build.yml | 4 ---- xmake.lua | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index b76c70537..6e51fbf01 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -41,10 +41,6 @@ jobs: - name: Update xmake repository run: xmake.exe repo --update - # Debug - - name: Debug XMake - run: xmake.exe l -vD utils.ci.packageskey - # Fetch xmake dephash - name: Retrieve dependencies hash id: dep_hash diff --git a/xmake.lua b/xmake.lua index f2fa79908..b94764157 100644 --- a/xmake.lua +++ b/xmake.lua @@ -244,7 +244,7 @@ rule("embed_resources") if xmake.version():ge("2.5.9") then import("utils.progress") else - import("private.utils.progress") + import("utils.progress", { try = true }) or import("private.utils.progress") end local function GenerateEmbedHeader(filepath, targetpath)