Skip to content

Commit df370ed

Browse files
committed
chore: uncommitted agent changes
1 parent 6a801e1 commit df370ed

4 files changed

Lines changed: 22 additions & 32 deletions

File tree

.github/workflows/ci.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,6 @@ env:
1616
REGISTRY: ghcr.io
1717
IMAGE_NAME: ${{ github.repository }}
1818
PLATFORM_TEST_DOCKER_MODE: skip
19-
env:
20-
CARGO_TERM_COLOR: always
21-
CARGO_INCREMENTAL: 0
22-
RUST_BACKTRACE: short
23-
CARGO_NET_RETRY: 10
24-
RUSTUP_MAX_RETRIES: 10
25-
REGISTRY: ghcr.io
26-
IMAGE_NAME: ${{ github.repository }}
2719

2820
concurrency:
2921
group: ${{ github.workflow }}-${{ github.ref }}

scripts/test-all.sh

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77

88
set -euo pipefail
99

10-
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
11-
# shellcheck source=./test-harness.sh
12-
source "${SCRIPT_DIR}/test-harness.sh"
1310
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
1411
# shellcheck source=./test-harness.sh
1512
source "${SCRIPT_DIR}/test-harness.sh"
@@ -20,15 +17,7 @@ SKIPPED=0
2017

2118
platform_test_init
2219
trap platform_cleanup_run_dir EXIT
23-
24-
if [ "${PLATFORM_TEST_DOCKER_MODE}" != "skip" ]; then
25-
if ! platform_has_docker || ! platform_has_compose; then
26-
log_info "Docker/Compose missing; attempting installation"
27-
"${SCRIPT_DIR}/install-docker.sh"
28-
fi
29-
fi
30-
platform_test_init
31-
trap platform_cleanup_run_dir EXIT
20+
platform_install_docker_if_needed
3221

3322
log_info "=== Platform Test Suite ==="
3423
log_info "Artifacts: ${PLATFORM_TEST_ARTIFACTS_DIR}"

scripts/test-comprehensive.sh

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77

88
set -euo pipefail
99

10-
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
11-
# shellcheck source=./test-harness.sh
12-
source "${SCRIPT_DIR}/test-harness.sh"
1310
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
1411
# shellcheck source=./test-harness.sh
1512
source "${SCRIPT_DIR}/test-harness.sh"
@@ -20,15 +17,7 @@ SKIPPED=0
2017

2118
platform_test_init
2219
trap platform_cleanup_run_dir EXIT
23-
24-
if [ "${PLATFORM_TEST_DOCKER_MODE}" != "skip" ]; then
25-
if ! platform_has_docker || ! platform_has_compose; then
26-
log_info "Docker/Compose missing; attempting installation"
27-
"${SCRIPT_DIR}/install-docker.sh"
28-
fi
29-
fi
30-
platform_test_init
31-
trap platform_cleanup_run_dir EXIT
20+
platform_install_docker_if_needed
3221

3322
log_info "============================================================================="
3423
log_info " Platform Comprehensive Test Suite"

scripts/test-harness.sh

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,22 @@ BLUE='\033[0;34m'
2424
NC='\033[0m'
2525

2626
log_info() {
27+
}
28+
29+
platform_install_docker_if_needed() {
30+
if [ "${PLATFORM_TEST_DOCKER_MODE}" = "skip" ]; then
31+
return 0
32+
fi
33+
34+
if platform_has_docker && platform_has_compose; then
35+
return 0
36+
fi
37+
38+
local script_dir
39+
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
40+
log_info "Docker/Compose missing; attempting installation"
41+
"${script_dir}/install-docker.sh"
42+
}
2743
echo -e "${BLUE}[INFO]${NC} $1"
2844
}
2945

@@ -93,6 +109,9 @@ platform_require_command() {
93109
fi
94110
}
95111

112+
platform_has_docker() {
113+
command -v docker >/dev/null 2>&1 && docker info >/dev/null 2>&1
114+
}
96115
platform_has_docker() {
97116
command -v docker >/dev/null 2>&1 && docker info >/dev/null 2>&1
98117
}
@@ -104,6 +123,7 @@ platform_require_docker() {
104123
fi
105124
}
106125

126+
platform_has_compose() {
107127
platform_has_compose() {
108128
if command -v docker >/dev/null 2>&1 && docker compose version >/dev/null 2>&1; then
109129
return 0

0 commit comments

Comments
 (0)