fix upload path for linux/docker + comments

This commit is contained in:
tooomm 2026-07-26 22:08:52 +02:00
parent 163098b0a8
commit 1118c26a5c
3 changed files with 13 additions and 12 deletions

View file

@ -1,8 +1,6 @@
#!/usr/bin/env bash #!/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: # Build flow and script structure:
# - Read options # - Read options
@ -11,8 +9,8 @@ set -euo pipefail
# - Pre-buld (ccache) # - Pre-buld (ccache)
# - Build (Configure, Compile) # - Build (Configure, Compile)
# - Post-build (ccache, Inspect, Test, Install, Package) # - Post-build (ccache, Inspect, Test, Install, Package)
#
### Supported command-line options: # Supported command-line options:
# --ccache [<size>] Use ccache (USE_CCACHE) (optionally: provide cache size, e.g. "500M" or "1G" (CCACHE_SIZE)) # --ccache [<size>] Use ccache (USE_CCACHE) (optionally: provide cache size, e.g. "500M" or "1G" (CCACHE_SIZE))
# --cmake-generator <generator> Sets the CMake generator (CMAKE_GENERATOR), e.g. "Ninja", "Visual Studio 18 2026" # --cmake-generator <generator> Sets the CMake generator (CMAKE_GENERATOR), e.g. "Ninja", "Visual Studio 18 2026"
# --debug Sets the build type (BUILDTYPE --> CMAKE_BUILD_TYPE) # --debug Sets the build type (BUILDTYPE --> CMAKE_BUILD_TYPE)
@ -27,6 +25,13 @@ set -euo pipefail
# --target-macos-version <version> Sets the min OS version (TARGET_MACOS_VERSION), e.g. "14" [macOS only] # --target-macos-version <version> Sets the min OS version (TARGET_MACOS_VERSION), e.g. "14" [macOS only]
# --test Runs tests (MAKE_TEST) # --test Runs tests (MAKE_TEST)
# --vcpkg Use vcpkg package manager to resolve dependencies (USE_VCPKG) # --vcpkg Use vcpkg package manager to resolve dependencies (USE_VCPKG)
#
# Exit codes:
# 1 --> Failure
# 3 --> Invalid argument(s)
set -euo pipefail
### Initialize configuration variables: ### Initialize configuration variables:
# Precedence: command-line options > environment variables > built-in script defaults # 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_CCACHE="${USE_CCACHE:-0}" # See "--ccache" option
USE_VCPKG="${USE_VCPKG:-0}" # See "--vcpkg" flag USE_VCPKG="${USE_VCPKG:-0}" # See "--vcpkg" flag
### Exit codes:
# 1 --> Failure
# 3 --> Invalid argument(s)
### Read options ### Read options
while [[ $# != 0 ]]; do while [[ $# != 0 ]]; do

View file

@ -1,7 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -euo pipefail
# Used by the CI build script to rename package artifacts # Used by the CI build script to rename package artifacts
# #
# Appends PACKAGE_SUFFIX to the package's filename # Appends PACKAGE_SUFFIX to the package's filename
@ -14,6 +12,8 @@ set -euo pipefail
# Expects <extension> to be e.g. ".dmg", ".deb" or ".exe" (".tar.gz" etc. with more than one dot will break) # Expects <extension> to be e.g. ".dmg", ".deb" or ".exe" (".tar.gz" etc. with more than one dot will break)
# If multiple packages match <package_pattern>, the first match is used # If multiple packages match <package_pattern>, the first match is used
set -euo pipefail
# Initialize PACKAGE_SUFFIX from positional argument # Initialize PACKAGE_SUFFIX from positional argument
PACKAGE_SUFFIX="${1:-}" PACKAGE_SUFFIX="${1:-}"

View file

@ -227,7 +227,7 @@ jobs:
with: with:
archive: false archive: false
if-no-files-found: error 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" - name: "Upload to release"
id: upload_release id: upload_release