From b0bfbaffdd25f37fb41301fd7d2b460f652d2f10 Mon Sep 17 00:00:00 2001 From: Hackerl <490021209@qq.com> Date: Thu, 6 Jul 2023 17:13:25 +0800 Subject: [PATCH] fix bug: update musl toolchain path --- .github/workflows/Elkeid.yml | 2 +- .github/workflows/Elkeid_rasp_release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Elkeid.yml b/.github/workflows/Elkeid.yml index 0e2ab30a9..3314a4263 100644 --- a/.github/workflows/Elkeid.yml +++ b/.github/workflows/Elkeid.yml @@ -34,7 +34,7 @@ jobs: - name: Build RASP run: | curl -fsSL https://lf3-static.bytednsdoc.com/obj/eden-cn/laahweh7uhwbps/php-headers.tar.gz | tar -xz -C rasp/php - docker run --rm --pull=always -v $(pwd):/Elkeid -e MAKEFLAGS="-j$(nproc)" hackerl/rasp-toolchain make -C /Elkeid/rasp build STATIC=TRUE PY_PREBUILT=TRUE CC=/opt/x86_64-linux-musl-1.2.2/bin/x86_64-linux-musl-gcc CXX=/opt/x86_64-linux-musl-1.2.2/bin/x86_64-linux-musl-g++ LD=/opt/x86_64-linux-musl-1.2.2/bin/x86_64-linux-musl-ld CARGO_TARGET_X86_64_UNKNOWN_LINUX_MUSL_LINKER=/opt/x86_64-linux-musl-1.2.2/bin/x86_64-linux-musl-ld GNU_CC=/opt/gcc-10.4.0/bin/gcc GNU_CXX=/opt/gcc-10.4.0/bin/g++ PHP_HEADERS=/Elkeid/rasp/php/php-headers PYTHON2_INCLUDE=/usr/local/include/python2.7 PYTHON3_INCLUDE=/usr/local/include/python3.6m + docker run --rm --pull=always -v $(pwd):/Elkeid -e MAKEFLAGS="-j$(nproc)" hackerl/rasp-toolchain make -C /Elkeid/rasp build STATIC=TRUE PY_PREBUILT=TRUE CC=/opt/x86_64-linux-musl-native/bin/x86_64-linux-musl-gcc CXX=/opt/x86_64-linux-musl-native/bin/x86_64-linux-musl-g++ LD=/opt/x86_64-linux-musl-native/bin/ld CARGO_TARGET_X86_64_UNKNOWN_LINUX_MUSL_LINKER=/opt/x86_64-linux-musl-native/bin/ld GNU_CC=/opt/gcc-10.4.0/bin/gcc GNU_CXX=/opt/gcc-10.4.0/bin/g++ PHP_HEADERS=/Elkeid/rasp/php/php-headers PYTHON2_INCLUDE=/usr/include/python2.7 PYTHON3_INCLUDE=/usr/include/python3.6m - name: Upload RASP uses: actions/upload-artifact@v3 diff --git a/.github/workflows/Elkeid_rasp_release.yml b/.github/workflows/Elkeid_rasp_release.yml index 08b645eb1..21b57c87e 100644 --- a/.github/workflows/Elkeid_rasp_release.yml +++ b/.github/workflows/Elkeid_rasp_release.yml @@ -16,7 +16,7 @@ jobs: - name: Build run: | curl -fsSL https://lf3-static.bytednsdoc.com/obj/eden-cn/laahweh7uhwbps/php-headers.tar.gz | tar -xz -C rasp/php - docker run --rm --pull=always -v $(pwd):/Elkeid -v /tmp/cache/gradle:/root/.gradle -v /tmp/cache/librasp:/Elkeid/rasp/librasp/target -v /tmp/cache/rasp_server:/Elkeid/rasp/rasp_server/target -v /tmp/cache/plugin:/Elkeid/rasp/plugin/target -e MAKEFLAGS="-j$(nproc)" hackerl/rasp-toolchain make -C /Elkeid/rasp build STATIC=TRUE PY_PREBUILT=TRUE CC=/opt/x86_64-linux-musl-1.2.2/bin/x86_64-linux-musl-gcc CXX=/opt/x86_64-linux-musl-1.2.2/bin/x86_64-linux-musl-g++ LD=/opt/x86_64-linux-musl-1.2.2/bin/x86_64-linux-musl-ld CARGO_TARGET_X86_64_UNKNOWN_LINUX_MUSL_LINKER=/opt/x86_64-linux-musl-1.2.2/bin/x86_64-linux-musl-ld GNU_CC=/opt/gcc-10.4.0/bin/gcc GNU_CXX=/opt/gcc-10.4.0/bin/g++ PHP_HEADERS=/Elkeid/rasp/php/php-headers PYTHON2_INCLUDE=/usr/local/include/python2.7 PYTHON3_INCLUDE=/usr/local/include/python3.6m VERSION=${GITHUB_REF#refs/*/rasp-v} + docker run --rm --pull=always -v $(pwd):/Elkeid -e MAKEFLAGS="-j$(nproc)" hackerl/rasp-toolchain make -C /Elkeid/rasp build STATIC=TRUE PY_PREBUILT=TRUE CC=/opt/x86_64-linux-musl-native/bin/x86_64-linux-musl-gcc CXX=/opt/x86_64-linux-musl-native/bin/x86_64-linux-musl-g++ LD=/opt/x86_64-linux-musl-native/bin/ld CARGO_TARGET_X86_64_UNKNOWN_LINUX_MUSL_LINKER=/opt/x86_64-linux-musl-native/bin/ld GNU_CC=/opt/gcc-10.4.0/bin/gcc GNU_CXX=/opt/gcc-10.4.0/bin/g++ PHP_HEADERS=/Elkeid/rasp/php/php-headers PYTHON2_INCLUDE=/usr/include/python2.7 PYTHON3_INCLUDE=/usr/include/python3.6m VERSION=${GITHUB_REF#refs/*/rasp-v} - name: Release uses: softprops/action-gh-release@v1