Skip to content

Commit

Permalink
fix: Windows builds with Haxe 3 fail
Browse files Browse the repository at this point in the history
  • Loading branch information
sebthom committed Jul 20, 2024
1 parent 012ae01 commit 89de944
Showing 1 changed file with 8 additions and 9 deletions.
17 changes: 8 additions & 9 deletions .github/actions/internal/setup-lua/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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+=" [email protected]"
echo "::endgroup::"
;;
Expand Down

0 comments on commit 89de944

Please sign in to comment.