From ee1a7815e9c661a3dea6449ff0e8a5ba114e8d1b Mon Sep 17 00:00:00 2001 From: tooomm Date: Sun, 26 Jul 2026 23:10:56 +0200 Subject: [PATCH] debug nsis --- .ci/compile.sh | 2 ++ .ci/name_build.sh | 1 + .github/workflows/desktop-build.yml | 15 ++++++++++----- format.sh | 2 +- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.ci/compile.sh b/.ci/compile.sh index 606f6248c..ef895e51f 100755 --- a/.ci/compile.sh +++ b/.ci/compile.sh @@ -326,10 +326,12 @@ if [[ $USE_CCACHE == 1 ]]; then ccache --show-config echo " -----" ccache --show-stats + ccache --show-compression echo " -----" ccache --zero-stats echo " -----" ccache --show-stats + ccache --show-compression echo "::endgroup::" fi diff --git a/.ci/name_build.sh b/.ci/name_build.sh index 36b565782..d221534f1 100755 --- a/.ci/name_build.sh +++ b/.ci/name_build.sh @@ -47,6 +47,7 @@ echo "Renaming '$package' to '$package_new'" mv "$package_path" "$package_path_new" du -h "$package_path_new" +#TODO remove package_path as it's default working direcotry / repo root? { echo "package_path=$package_path_new" >> "$GITHUB_OUTPUT" echo "package=$package_new" >> "$GITHUB_OUTPUT" diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml index 911851bec..f04bd8ed1 100644 --- a/.github/workflows/desktop-build.yml +++ b/.github/workflows/desktop-build.yml @@ -227,7 +227,7 @@ jobs: with: archive: false if-no-files-found: error - path: ${{ steps.build.outputs.package }} # package is resolved against workspace (container path /= host path) + path: ${{ steps.build.outputs.package }} # package is resolved against github.workspace - name: "Upload to release" id: upload_release @@ -235,10 +235,10 @@ jobs: shell: bash env: package: ${{ steps.build.outputs.package }} - package_path: ${{ steps.build.outputs.package_path }} + package_path: ${{ steps.build.outputs.package_path }} # <-- to check GH_TOKEN: ${{ github.token }} tag_name: ${{ needs.configure.outputs.tag }} - run: gh release upload "$tag_name" "$package_path#$package" + run: gh release upload "$tag_name" "$package_path#$package" # <-- to check - name: "Attest binary provenance" id: attestation @@ -246,13 +246,13 @@ jobs: uses: actions/attest@v4 with: show-summary: false - subject-path: ${{ steps.build.outputs.package_path }} + subject-path: ${{ steps.build.outputs.package_path }} # <-- to check - name: "Verify binary attestation" if: steps.attestation.outcome == 'success' shell: bash env: - PACKAGE_PATH: ${{ steps.build.outputs.package_path }} + PACKAGE_PATH: ${{ steps.build.outputs.package_path }} # <-- to check GH_TOKEN: ${{ github.token }} run: gh attestation verify "$PACKAGE_PATH" --repo Cockatrice/Cockatrice @@ -451,6 +451,11 @@ jobs: VCPKG_BINARY_SOURCES: 'clear;files,${{ steps.vcpkg-cache.outputs.path }},readwrite' VCPKG_DISABLE_METRICS: 1 run: .ci/compile.sh --server --test --vcpkg + continue-on-error: true + + - name: "[Windows] DEBUG: Print NSIS log output" + if: matrix.os == 'Windows' + run: cat "_CPack_Packages/win64/NSIS/NSISOutput.log" # Delete used cache to emulate a ccache update. See https://github.com/actions/cache/issues/342 - name: "[macOS] Delete remote compiler cache (ccache)" diff --git a/format.sh b/format.sh index 45eef9b41..01239479b 100755 --- a/format.sh +++ b/format.sh @@ -33,7 +33,7 @@ cmakeinclude=("cmake/gtest-CMakeLists.txt.in") scripts="*.sh" color="--" verbosity=0 -separator="----------" +separator=" ----------" # Parse options while [[ $* ]]; do