diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3fe6b57..33aa604 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -73,21 +73,6 @@ jobs: - name: Add CMake to path run: echo "$GITHUB_WORKSPACE/cmake-3.30.5-linux-x86_64/bin" >> $GITHUB_PATH - - name: Get WolfSSL for MinGW (pre-built from MSYS2) - run: | - if [ ! -d "/usr/x86_64-w64-mingw32/include/wolfssl" ]; then - wget -q "https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-wolfssl-5.7.2-1-any.pkg.tar.zst" - tar xf mingw-w64-x86_64-wolfssl-5.7.2-1-any.pkg.tar.zst - sudo cp -r mingw64/include/wolfssl /usr/x86_64-w64-mingw32/include/ - sudo cp mingw64/lib/libwolfssl.a /usr/x86_64-w64-mingw32/lib/ - fi - - - name: Patch missing MinGW headers - run: | - [ -f /usr/x86_64-w64-mingw32/include/consoleapi.h ] || \ - printf '#pragma once\n#include \n' | \ - sudo tee /usr/x86_64-w64-mingw32/include/consoleapi.h > /dev/null - - name: Configure CMake run: | cmake -B build -S . \ @@ -96,13 +81,10 @@ jobs: -DCMAKE_CXX_COMPILER=x86_64-w64-mingw32-g++ \ -DCMAKE_RC_COMPILER=x86_64-w64-mingw32-windres \ -DCMAKE_C_COMPILER_LAUNCHER=ccache \ - -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ - -DWOLFSSL_ROOT_DIR=/usr/x86_64-w64-mingw32 \ - -DWOLFSSL_INCLUDE_DIR=/usr/x86_64-w64-mingw32/include \ - -DWOLFSSL_LIBRARY=/usr/x86_64-w64-mingw32/lib/libwolfssl.a + -DCMAKE_CXX_COMPILER_LAUNCHER=ccache - name: Build Unlocker - run: cmake --build build --target dbd-unlocker + run: cmake --build build --target hex-unlocked - name: Package Build run: | @@ -110,14 +92,14 @@ jobs: echo "Found EXE: $EXE" mkdir -p release cp "$EXE" release/ - cp res/*.json release/ - cd release && zip -j ../unlocker.zip * + if [ -d "res" ]; then cp res/*.json release/; fi + cd release && zip -j ../hex-unlocked.zip * - name: Upload Artifact uses: actions/upload-artifact@v4 with: - name: unlocker-build - path: unlocker.zip + name: runner-build + path: hex-unlocked.zip - name: Finalize Version and Push Tag if: ${{ github.event_name == 'push' && success() }} @@ -129,7 +111,7 @@ jobs: if: ${{ github.event_name == 'push' && success() }} uses: akkuman/gitea-release-action@v1 with: - files: unlocker.zip + files: hex-unlocked.zip tag_name: ${{ steps.calculate-version.outputs.new-tag }} name: Release ${{ steps.calculate-version.outputs.new-tag }} body: ${{ steps.calculate-version.outputs.changelog }} \ No newline at end of file