fix(benchmarks): import CloudSandboxStrategy from cloud_aws; guard empty base_ref in benchmark-regression workflow
CI / push-validation (pull_request) Successful in 25s
CI / lint (pull_request) Successful in 45s
CI / quality (pull_request) Successful in 47s
CI / helm (pull_request) Successful in 49s
CI / build (pull_request) Successful in 50s
CI / typecheck (pull_request) Successful in 1m5s
CI / security (pull_request) Successful in 1m9s
CI / unit_tests (pull_request) Successful in 4m27s
CI / docker (pull_request) Successful in 1m28s
CI / integration_tests (pull_request) Successful in 9m16s
CI / coverage (pull_request) Successful in 11m38s
CI / status-check (pull_request) Successful in 3s
CI / push-validation (pull_request) Successful in 25s
CI / lint (pull_request) Successful in 45s
CI / quality (pull_request) Successful in 47s
CI / helm (pull_request) Successful in 49s
CI / build (pull_request) Successful in 50s
CI / typecheck (pull_request) Successful in 1m5s
CI / security (pull_request) Successful in 1m9s
CI / unit_tests (pull_request) Successful in 4m27s
CI / docker (pull_request) Successful in 1m28s
CI / integration_tests (pull_request) Successful in 9m16s
CI / coverage (pull_request) Successful in 11m38s
CI / status-check (pull_request) Successful in 3s
CloudSandboxStrategy is defined in cloud_aws.py, not cloud.py. The benchmark was importing it from the wrong module, causing an ImportError during benchmark discovery. The benchmark-regression CI job's "Compute base commit" step used forgejo.base_ref which is empty for push events, causing `git merge-base HEAD "origin/"` to fail with exit 128. Add a guard that falls back to HEAD~1 when base_ref is unset.
This commit is contained in:
@@ -16,18 +16,18 @@ from pathlib import Path
|
||||
try:
|
||||
from cleveragents.resource.handlers.cloud import (
|
||||
CloudResourceHandler,
|
||||
CloudSandboxStrategy,
|
||||
resolve_credentials,
|
||||
validate_credentials,
|
||||
)
|
||||
from cleveragents.resource.handlers.cloud_aws import CloudSandboxStrategy
|
||||
except ModuleNotFoundError:
|
||||
sys.path.insert(0, str(Path(__file__).resolve().parents[1] / "src"))
|
||||
from cleveragents.resource.handlers.cloud import (
|
||||
CloudResourceHandler,
|
||||
CloudSandboxStrategy,
|
||||
resolve_credentials,
|
||||
validate_credentials,
|
||||
)
|
||||
from cleveragents.resource.handlers.cloud_aws import CloudSandboxStrategy
|
||||
|
||||
|
||||
_CLOUD_ENV_VARS = [
|
||||
|
||||
Reference in New Issue
Block a user