From 89de944ae13155095d756f996b298199afb025ce Mon Sep 17 00:00:00 2001 From: sebthom Date: Sat, 20 Jul 2024 17:33:36 +0200 Subject: [PATCH] fix: Windows builds with Haxe 3 fail --- .github/actions/internal/setup-lua/action.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/actions/internal/setup-lua/action.yml b/.github/actions/internal/setup-lua/action.yml index 6d1695d..f49b695 100644 --- a/.github/actions/internal/setup-lua/action.yml +++ b/.github/actions/internal/setup-lua/action.yml @@ -126,13 +126,13 @@ runs: } echo "::group::Setup Lua: Install mingw/pcre" - # for Haxe < 4.3 - install_mingw_package "pcre" "8.45-1" - lualib_install_opts+=" PCRE_INCDIR=$(cygpath -wsa /include) PCRE_LIBDIR=$(cygpath -wsa /lib)" + # for Haxe < 4.3 + install_mingw_package "pcre" "8.45-1" + lualib_install_opts+=" PCRE_INCDIR=$(cygpath -wsa /include) PCRE_LIBDIR=$(cygpath -wsa /lib)" - # for Haxe >= 4.3 - install_mingw_package "pcre2" "10.43-2" - lualib_install_opts+=" PCRE2_INCDIR=$(cygpath -wsa /include) PCRE2_LIBDIR=$(cygpath -wsa /lib)" + # for Haxe >= 4.3 + install_mingw_package "pcre2" "10.44-1" + lualib_install_opts+=" PCRE2_INCDIR=$(cygpath -wsa /include) PCRE2_LIBDIR=$(cygpath -wsa /lib)" echo "::endgroup::" echo "::group::Setup Lua: Install mingw/openssl" @@ -148,9 +148,8 @@ runs: echo "::endgroup::" echo "::group::Setup Lua: Patch luarocks/environ" # for Haxe 3 - # https://github.com/moteus/lua-environ/issues/1 - curl -sSfL https://raw.githubusercontent.com/moteus/lua-environ/master/rockspecs/environ-0.1.0-1.rockspec | grep -v 'libraries = {"user32"},' > $CACHE_FOLDER/environ-0.1.0-1.rockspec - lualibs+=" $(cygpath -wa "$CACHE_FOLDER/environ-0.1.0-1.rockspec")" + curl -sSfL https://raw.githubusercontent.com/sebthom/hx-lua-environ/master/rockspecs/environ-scm-0.rockspec -o $CACHE_FOLDER/environ-scm-0.rockspec + lualibs+=" $(cygpath -wa "$CACHE_FOLDER/environ-scm-0.rockspec")" #lualibs+=" environ@0.1.0-1" echo "::endgroup::" ;;