From 1118c26a5cac1c92d816f4d5ee54fee21e8ecd72 Mon Sep 17 00:00:00 2001 From: tooomm Date: Sun, 26 Jul 2026 22:08:52 +0200 Subject: [PATCH] fix upload path for linux/docker + comments --- .ci/compile.sh | 19 ++++++++++--------- .ci/name_build.sh | 4 ++-- .github/workflows/desktop-build.yml | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.ci/compile.sh b/.ci/compile.sh index da45ec6af..606f6248c 100755 --- a/.ci/compile.sh +++ b/.ci/compile.sh @@ -1,8 +1,6 @@ #!/usr/bin/env bash -set -euo pipefail - -### Compiles Cockatrice inside GitHub Actions CI, run only from project root directory (GITHUB_WORKSPACE) +# Compiles Cockatrice inside GitHub Actions CI, run only from project root directory (GITHUB_WORKSPACE) # # Build flow and script structure: # - Read options @@ -11,8 +9,8 @@ set -euo pipefail # - Pre-buld (ccache) # - Build (Configure, Compile) # - Post-build (ccache, Inspect, Test, Install, Package) - -### Supported command-line options: +# +# Supported command-line options: # --ccache [] Use ccache (USE_CCACHE) (optionally: provide cache size, e.g. "500M" or "1G" (CCACHE_SIZE)) # --cmake-generator Sets the CMake generator (CMAKE_GENERATOR), e.g. "Ninja", "Visual Studio 18 2026" # --debug Sets the build type (BUILDTYPE --> CMAKE_BUILD_TYPE) @@ -27,6 +25,13 @@ set -euo pipefail # --target-macos-version Sets the min OS version (TARGET_MACOS_VERSION), e.g. "14" [macOS only] # --test Runs tests (MAKE_TEST) # --vcpkg Use vcpkg package manager to resolve dependencies (USE_VCPKG) +# +# Exit codes: +# 1 --> Failure +# 3 --> Invalid argument(s) + +set -euo pipefail + ### Initialize configuration variables: # Precedence: command-line options > environment variables > built-in script defaults @@ -46,10 +51,6 @@ TARGET_MACOS_VERSION="${TARGET_MACOS_VERSION:-}" # See "--target-macos-versio USE_CCACHE="${USE_CCACHE:-0}" # See "--ccache" option USE_VCPKG="${USE_VCPKG:-0}" # See "--vcpkg" flag -### Exit codes: -# 1 --> Failure -# 3 --> Invalid argument(s) - ### Read options while [[ $# != 0 ]]; do diff --git a/.ci/name_build.sh b/.ci/name_build.sh index 07c93c675..36b565782 100755 --- a/.ci/name_build.sh +++ b/.ci/name_build.sh @@ -1,7 +1,5 @@ #!/usr/bin/env bash -set -euo pipefail - # Used by the CI build script to rename package artifacts # # Appends PACKAGE_SUFFIX to the package's filename @@ -14,6 +12,8 @@ set -euo pipefail # Expects to be e.g. ".dmg", ".deb" or ".exe" (".tar.gz" etc. with more than one dot will break) # If multiple packages match , the first match is used +set -euo pipefail + # Initialize PACKAGE_SUFFIX from positional argument PACKAGE_SUFFIX="${1:-}" diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml index 13eae89c9..911851bec 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_path }} + path: ${{ steps.build.outputs.package }} # package is resolved against workspace (container path /= host path) - name: "Upload to release" id: upload_release