From 44813cb4296444f1b6522ac3f2f8b46fe76eb5df Mon Sep 17 00:00:00 2001 From: A13501350 <18516149786@163.com> Date: Sat, 20 Sep 2025 21:35:26 +0800 Subject: [PATCH] test x86 --- .github/workflows/test-ci-windows.yml | 181 +++++++++++++------------- 1 file changed, 94 insertions(+), 87 deletions(-) diff --git a/.github/workflows/test-ci-windows.yml b/.github/workflows/test-ci-windows.yml index fbbd6368..7cfa0590 100644 --- a/.github/workflows/test-ci-windows.yml +++ b/.github/workflows/test-ci-windows.yml @@ -9,106 +9,113 @@ on: - v2/test-ci-windows jobs: - test-winget: - name: Test winget availability - runs-on: windows-latest # 使用最新的 Windows Server 运行器 + build: + strategy: + matrix: + arch: [x86, x64] + runs-on: windows-latest + # For Caching + permissions: + actions: read + contents: read + steps: - - name: Check if winget is installed - run: | - # 检查 winget 是否可用 - winget --version - if ($LASTEXITCODE -eq 0) { - Write-Host "✅ winget is installed and working correctly" - } else { - Write-Error "❌ winget is not available or not functioning properly" - exit 1 - } - shell: pwsh # 使用 PowerShell 作为 shell - - - name: Optional - List installed packages (if winget is available) - if: success() - run: | - # 列出已安装的包以验证 winget 功能 - winget list --name "Microsoft Visual C++" - Write-Host "winget functionality verified successfully" + - name: Checkout code + uses: actions/checkout@v5 + + - name: Install Apache for x86 + if: matrix.arch == 'x86' shell: pwsh - -# jobs: -# build: -# runs-on: windows-latest - -# # For Caching -# permissions: -# actions: read -# contents: read + run: | + $apachePath = "${{ github.workspace }}\apache-x86" + New-Item -ItemType Directory -Path $apachePath -Force + choco install apache-httpd -y --force --forcex86 --params="`"/installLocation:$apachePath /noService`"" + # 设置环境变量供后续步骤使用 + echo "APACHE_ROOT=$apachePath\Apache24" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append -# steps: -# - name: Checkout code -# uses: actions/checkout@v5 + - name: Set Apache path for x64 + if: matrix.arch == 'x64' + shell: pwsh + run: | + # 对于 x64,使用预装的 Apache + echo "APACHE_ROOT=C:\tools\Apache24" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append -# - name: Setup MSYS2 -# uses: msys2/setup-msys2@v2 -# with: -# msystem: UCRT64 -# update: true -# install: > -# git -# make -# autoconf -# automake -# libtool -# mingw-w64-ucrt-x86_64-gcc -# mingw-w64-ucrt-x86_64-pkg-config + - name: Setup MSYS2 + uses: msys2/setup-msys2@v2 + with: + msystem: ${{ matrix.arch == 'x86' && 'MINGW32' || 'UCRT64' }} + update: true + install: > + git + make + autoconf + automake + libtool + ${{ matrix.arch == 'x86' && 'mingw-w64-ucrt-i686-gcc' || 'mingw-w64-ucrt-x86_64-gcc' }} + ${{ matrix.arch == 'x86' && 'mingw-w64-ucrt-i686-pkg-config' || 'mingw-w64-ucrt-x86_64-pkg-config' }} -# - name: Clone and build ssdeep -# shell: msys2 {0} -# run: | -# MSYS2_WORKSPACE=$(cygpath -u '${{ github.workspace }}') -# echo "Converted workspace path: $MSYS2_WORKSPACE" + - name: Clone and build ssdeep + shell: msys2 {0} + run: | + MSYS2_WORKSPACE=$(cygpath -u '${{ github.workspace }}') + echo "Converted workspace path: $MSYS2_WORKSPACE" -# git clone https://github.com/ssdeep-project/ssdeep.git --depth 1 -# cd ssdeep -# autoreconf -i -# ./configure --enable-shared --disable-static CFLAGS="-O3" CXXFLAGS="-O3" -# make dll + git clone https://github.com/ssdeep-project/ssdeep.git --depth 1 + cd ssdeep + autoreconf -i + + if [ "${{ matrix.arch }}" = "x86" ]; then + ./configure --enable-shared --disable-static CFLAGS="-O3" CXXFLAGS="-O3" --build=i686-pc-mingw32 + else + ./configure --enable-shared --disable-static CFLAGS="-O3" CXXFLAGS="-O3" + fi + + make dll -# mkdir -p "${MSYS2_WORKSPACE}/ssdeep-install/bin" -# mkdir -p "${MSYS2_WORKSPACE}/ssdeep-install/include" -# cp -v fuzzy.dll "${MSYS2_WORKSPACE}/ssdeep-install/bin/" -# cp -v fuzzy.h "${MSYS2_WORKSPACE}/ssdeep-install/include/" -# cp -v fuzzy.def "${MSYS2_WORKSPACE}/ssdeep-install/" + mkdir -p "${MSYS2_WORKSPACE}/ssdeep-install-${{ matrix.arch }}/bin" + mkdir -p "${MSYS2_WORKSPACE}/ssdeep-install-${{ matrix.arch }}/include" + cp -v fuzzy.dll "${MSYS2_WORKSPACE}/ssdeep-install-${{ matrix.arch }}/bin/" + cp -v fuzzy.h "${MSYS2_WORKSPACE}/ssdeep-install-${{ matrix.arch }}/include/" + cp -v fuzzy.def "${MSYS2_WORKSPACE}/ssdeep-install-${{ matrix.arch }}/" -# - name: Restore vcpkg cache -# id: vcpkg-cache -# uses: TAServers/vcpkg-cache@v3 -# with: -# token: ${{ secrets.GITHUB_TOKEN }} -# prefix: vcpkg-iis-module/ + - name: Restore vcpkg cache + id: vcpkg-cache + uses: TAServers/vcpkg-cache@v3 + with: + token: ${{ secrets.GITHUB_TOKEN }} + prefix: vcpkg-iis-module-${{ matrix.arch }}/ -# - name: Configure CMake for IIS Module -# env: -# VCPKG_FEATURE_FLAGS: "binarycaching" -# VCPKG_BINARY_SOURCES: "clear;files,${{ steps.vcpkg-cache.outputs.path }},readwrite" -# run: | -# cmake ` -# -DAPACHE_ROOT="C:\tools\Apache24" ` -# -DSSDEEP_ROOT="${{ github.workspace }}\ssdeep-install" ` -# -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}\install" ` -# -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT\scripts\buildsystems\vcpkg.cmake" ` -# -DWITH_SSDEEP=ON ` -# -DWITH_LUA=ON ` -# -DWITH_YAJL=ON ` -# -S IIS -B iis\build + - name: Configure CMake for IIS Module + env: + VCPKG_FEATURE_FLAGS: "binarycaching" + VCPKG_BINARY_SOURCES: "clear;files,${{ steps.vcpkg-cache.outputs.path }},readwrite" + VCPKG_DEFAULT_TRIPLET: ${{ matrix.arch }}-windows + run: | + $archFlag = "${{ matrix.arch }}" + $cmakeArch = if ($archFlag -eq "x86") { "Win32" } else { "x64" } + + cmake ` + -DAPACHE_ROOT="$env:APACHE_ROOT" ` + -DSSDEEP_ROOT="${{ github.workspace }}\ssdeep-install-${{ matrix.arch }}" ` + -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}\install-${{ matrix.arch }}" ` + -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT\scripts\buildsystems\vcpkg.cmake" ` + -A $cmakeArch ` + -DWITH_SSDEEP=ON ` + -DWITH_LUA=ON ` + -DWITH_YAJL=ON ` + -S IIS -B "iis\build-${{ matrix.arch }}" -# - name: Build IIS Module -# shell: pwsh -# run: | -# cmake --build iis\build --config Release + - name: Build IIS Module + shell: pwsh + run: | + cmake --build "iis\build-${{ matrix.arch }}" --config Release # - name: Package IIS Module with WiX # shell: pwsh # run: | # $CURRENT_DIR = "${{ github.workspace }}/iis/wix" - # candle.exe -ext WixUtilExtension -ext WixUIExtension "$CURRENT_DIR\installer.wxs" -out "$CURRENT_DIR\installer.wixobj" -arch x64 - # light.exe -ext WixUtilExtension -ext WixUIExtension "$CURRENT_DIR\installer.wixobj" -out "$CURRENT_DIR\installer-64.msi" \ No newline at end of file + # $arch = "${{ matrix.arch }}" + # $wixArch = if ($arch -eq "x86") { "x86" } else { "x64" } + # candle.exe -ext WixUtilExtension -ext WixUIExtension "$CURRENT_DIR\installer.wxs" -out "$CURRENT_DIR\installer.wixobj" -arch $wixArch + # light.exe -ext WixUtilExtension -ext WixUIExtension "$CURRENT_DIR\installer.wixobj" -out "$CURRENT_DIR\installer-$arch.msi" \ No newline at end of file