From 0245c002e1c60030c978529b87102cee52a8f4e8 Mon Sep 17 00:00:00 2001 From: Reshetnikov Alexandr Date: Sat, 16 Sep 2023 11:21:19 +0400 Subject: [PATCH] busybox -> msys2 --- .github/workflows/build-windows-msys.yml | 2 +- redis/build_msys.sh | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-windows-msys.yml b/.github/workflows/build-windows-msys.yml index 93be8a63b..29a3d6063 100644 --- a/.github/workflows/build-windows-msys.yml +++ b/.github/workflows/build-windows-msys.yml @@ -26,7 +26,7 @@ jobs: - name: build ${{ inputs.workflow }}-windows-${{ inputs.toolset }} run: | - .tools\busybox.exe sh ${{ inputs.workflow }}\build_${{ inputs.toolset }}.sh + msys2 sh ${{ inputs.workflow }}\build_${{ inputs.toolset }}.sh - uses: actions/upload-artifact@v3 with: diff --git a/redis/build_msys.sh b/redis/build_msys.sh index 61490026b..e1e0989c2 100755 --- a/redis/build_msys.sh +++ b/redis/build_msys.sh @@ -23,11 +23,9 @@ echo "::endgroup::" echo "::group::build" -sed -i 's/__GNU_VISIBLE/1/' D:/a/_temp/msys64/usr/include/dlfcn.h +sed -i 's/__GNU_VISIBLE/1/' /d/a/_temp/msys64/usr/include/dlfcn.h -export BB_OVERRIDE_APPLETS=make - -msys2 make BUILD_TLS=yes +make BUILD_TLS=yes echo "::endgroup::"