Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
4 changes: 2 additions & 2 deletions .ci/test-gpu.sh → .ci/device-smoke/test-gpu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -euo pipefail

SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
. "${SCRIPT_DIR}/common.sh"
. "${SCRIPT_DIR}/../common.sh"

# Override timeout and sleep duration for macOS - emulation is significantly slower
case "${OS_TYPE}" in
Expand All @@ -15,7 +15,7 @@ case "${OS_TYPE}" in
DFB_SLEEP=5
;;
esac
export DFB_SLEEP
export TIMEOUT DFB_SLEEP
SEMU_DIRECTFB2_TEST="${SEMU_DIRECTFB2_TEST:-1}"
export SEMU_DIRECTFB2_TEST
MAKE_CHECK_DISKIMG_ARG=""
Expand Down
9 changes: 3 additions & 6 deletions .ci/test-netdev.sh → .ci/device-smoke/test-netdev.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Source common functions and settings
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
export SCRIPT_DIR
source "${SCRIPT_DIR}/common.sh"
source "${SCRIPT_DIR}/../common.sh"

# Override timeout for netdev tests
# Network tests need different timeout: 30s for Linux, 900s for macOS
Expand All @@ -22,11 +22,8 @@ esac
# Clean up any existing semu processes before starting tests
cleanup

# Platform detection
UNAME_S=$(uname -s)

# Check if running on macOS
if [[ ${UNAME_S} == "Darwin" ]]; then
if [[ ${OS_TYPE} == "Darwin" ]]; then
IS_MACOS=1
else
IS_MACOS=0
Expand Down Expand Up @@ -123,7 +120,7 @@ else
fi
fi

echo "Platform: ${UNAME_S}"
echo "Platform: ${OS_TYPE}"
echo "Network devices to test: ${NETWORK_DEVICES[@]}"

for NETDEV in "${NETWORK_DEVICES[@]}"; do
Expand Down
2 changes: 1 addition & 1 deletion .ci/test-sound.sh → .ci/device-smoke/test-sound.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -euo pipefail
# Source common functions and settings
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
export SCRIPT_DIR
source "${SCRIPT_DIR}/common.sh"
source "${SCRIPT_DIR}/../common.sh"

SAMPLE_SOUND="/usr/share/sounds/alsa/Front_Center.wav"

Expand Down
2 changes: 1 addition & 1 deletion .ci/test-vinput.sh → .ci/device-smoke/test-vinput.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -euo pipefail

SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
. "${SCRIPT_DIR}/common.sh"
. "${SCRIPT_DIR}/../common.sh"

# Override timeout for macOS - emulation is significantly slower
case "${OS_TYPE}" in
Expand Down
64 changes: 64 additions & 0 deletions .ci/github/append-github-output.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
#!/usr/bin/env bash
#
# GitHub Actions adapter for resolver/materializer KEY=VALUE files. The
# prebuilt scripts write machine-readable env-style plans to normal files; this
# helper is the only place that copies selected keys into $GITHUB_OUTPUT. It
# rejects non-output lines and fails if a requested key is missing, so workflow
# plumbing breaks at the boundary instead of silently producing empty outputs.

set -euo pipefail

if [ "$#" -lt 1 ]; then
echo "Usage: append-github-output.sh <file> [allowed-key ...]" >&2
exit 1
fi

file=$1
shift

: "${GITHUB_OUTPUT:?Need GITHUB_OUTPUT from GitHub Actions}"

tmp=$(mktemp)
cleanup() {
rm -f "$tmp"
}
trap cleanup EXIT

if awk -v keys="$*" '
BEGIN {
has_filter = (keys != "")
count = split(keys, key_list, " ")
for (i = 1; i <= count; i++) {
if (key_list[i] != "") allowed[key_list[i]] = 1
}
}
/^[A-Za-z_][A-Za-z0-9_]*=/ {
key = $0
sub(/=.*/, "", key)
if (!has_filter || key in allowed) {
print
seen[key] = 1
}
next
}
{
print "::error::Unexpected non-output line: " $0 > "/dev/stderr"
bad = 1
}
END {
if (has_filter) {
for (i = 1; i <= count; i++) {
key = key_list[i]
if (key != "" && !(key in seen)) {
print "::error::Missing requested output key: " key > "/dev/stderr"
bad = 1
}
}
}
exit bad
}
' "$file" > "$tmp"; then
cat "$tmp" >> "$GITHUB_OUTPUT"
else
exit 1
fi
4 changes: 2 additions & 2 deletions .ci/suggest-format.sh → .ci/github/suggest-format.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

set -euo pipefail

# Collect all C/C++ sources tracked by git (POSIX-compatible array build
# for bash 3.2 compatibility on macOS runners).
# Collect all C/C++ sources tracked by git into a Bash array without
# word-splitting filenames.
SOURCES=()
while IFS= read -r file; do
SOURCES+=("$file")
Expand Down
Loading
Loading