main backmerge #1152
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -49,6 +49,7 @@ help: ## Show this help message | |
| @echo "$(YELLOW)Test Configuration:$(NC)" | ||
| @echo " TEST_REPORTS_DIR Directory for HTML test reports (default: test-reports)" | ||
| @echo " GOTESTSUM_FORMAT Test output format: testname|dots|pkgname|standard-verbose (default: testname)" | ||
| @echo " PATTERN Substring pattern to filter tests (alternative to TESTCASE)" | ||
|
|
||
| cleanup-enterprise: ## Clean up enterprise directories if present | ||
| @echo "$(GREEN)Cleaning up enterprise...$(NC)" | ||
|
|
@@ -148,11 +149,9 @@ build: build-ui ## Build bifrost-http binary | |
| echo "$(GREEN)╚═══════════════════════════════════════╝$(NC)"; \ | ||
| fi | ||
| @if [ -n "$(DYNAMIC)" ]; then \ | ||
| echo "$(YELLOW)Note: This will create a dynamically linked build.$(NC)"; \ | ||
| else \ | ||
| echo "$(YELLOW)Note: This will create a statically linked build.$(NC)"; \ | ||
| fi | ||
| @mkdir -p ./tmp | ||
| @TARGET_OS="$(GOOS)"; \ | ||
|
|
@@ -214,7 +213,7 @@ _build-with-docker: # Internal target for Docker-based cross-compilation | |
| -e GOOS=$(TARGET_OS) \ | ||
| -e GOARCH=$(TARGET_ARCH) \ | ||
| $(if $(LOCAL),,-e GOWORK=off) \ | ||
| golang:1.25.5-alpine3.22 \ | ||
| sh -c "apk add --no-cache gcc musl-dev && \ | ||
| go build \ | ||
| -ldflags='-w -s -X main.Version=v$(VERSION)' \ | ||
|
|
@@ -231,7 +230,7 @@ _build-with-docker: # Internal target for Docker-based cross-compilation | |
| -e GOOS=$(TARGET_OS) \ | ||
| -e GOARCH=$(TARGET_ARCH) \ | ||
| $(if $(LOCAL),,-e GOWORK=off) \ | ||
| golang:1.25.5-alpine3.22 \ | ||
| sh -c "apk add --no-cache gcc musl-dev && \ | ||
| go build \ | ||
| -ldflags='-w -s -extldflags "-static" -X main.Version=v$(VERSION)' \ | ||
|
|
@@ -334,9 +333,14 @@ test: install-gotestsum ## Run tests for bifrost-http | |
| echo "$(CYAN)JUnit XML report: $(TEST_REPORTS_DIR)/bifrost-http.xml$(NC)"; \ | ||
| fi | ||
|
|
||
| test-core: install-gotestsum ## Run core tests (Usage: make test-core PROVIDER=openai TESTCASE=TestName or PATTERN=substring) | ||
| @echo "$(GREEN)Running core tests...$(NC)" | ||
| @mkdir -p $(TEST_REPORTS_DIR) | ||
| @if [ -n "$(PATTERN)" ] && [ -n "$(TESTCASE)" ]; then \ | ||
| echo "$(RED)Error: PATTERN and TESTCASE are mutually exclusive$(NC)"; \ | ||
| echo "$(YELLOW)Use PATTERN for substring matching or TESTCASE for exact match$(NC)"; \ | ||
| exit 1; \ | ||
| fi | ||
| @TEST_FAILED=0; \ | ||
| REPORT_FILE=""; \ | ||
| if [ -n "$(PROVIDER)" ]; then \ | ||
|
|
@@ -382,6 +386,30 @@ test-core: install-gotestsum ## Run core tests (Usage: make test-core PROVIDER=o | |
| echo ""; \ | ||
| echo "$(CYAN)JUnit XML report: $$REPORT_FILE$(NC)"; \ | ||
| fi; \ | ||
| elif [ -n "$(PATTERN)" ]; then \ | ||
| echo "$(CYAN)Running tests matching '$(PATTERN)' for $${PROVIDER_TEST_NAME}...$(NC)"; \ | ||
| REPORT_FILE="$(TEST_REPORTS_DIR)/core-$(PROVIDER)-$(PATTERN).xml"; \ | ||
| cd core/providers/$(PROVIDER) && GOWORK=off gotestsum \ | ||
| --format=$(GOTESTSUM_FORMAT) \ | ||
| --junitfile=../../../$$REPORT_FILE \ | ||
| -- -v -run ".*$(PATTERN).*" || TEST_FAILED=1; \ | ||
| cd ../../..; \ | ||
| $(MAKE) cleanup-junit-xml REPORT_FILE=$$REPORT_FILE; \ | ||
| if [ -z "$$CI" ] && [ -z "$$GITHUB_ACTIONS" ] && [ -z "$$GITLAB_CI" ] && [ -z "$$CIRCLECI" ] && [ -z "$$JENKINS_HOME" ]; then \ | ||
| if which junit-viewer > /dev/null 2>&1; then \ | ||
| echo "$(YELLOW)Generating HTML report...$(NC)"; \ | ||
| junit-viewer --results=$$REPORT_FILE --save=$${REPORT_FILE%.xml}.html 2>/dev/null || true; \ | ||
| echo ""; \ | ||
| echo "$(CYAN)HTML report: $${REPORT_FILE%.xml}.html$(NC)"; \ | ||
| echo "$(CYAN)Open with: open $${REPORT_FILE%.xml}.html$(NC)"; \ | ||
| else \ | ||
| echo ""; \ | ||
| echo "$(CYAN)JUnit XML report: $$REPORT_FILE$(NC)"; \ | ||
| fi; \ | ||
| else \ | ||
| echo ""; \ | ||
| echo "$(CYAN)JUnit XML report: $$REPORT_FILE$(NC)"; \ | ||
| fi; \ | ||
| else \ | ||
| echo "$(CYAN)Running Test$${PROVIDER_TEST_NAME}...$(NC)"; \ | ||
| REPORT_FILE="$(TEST_REPORTS_DIR)/core-$(PROVIDER).xml"; \ | ||
|
|
@@ -413,11 +441,20 @@ test-core: install-gotestsum ## Run core tests (Usage: make test-core PROVIDER=o | |
| echo "$(YELLOW)Usage: make test-core PROVIDER=openai TESTCASE=SpeechSynthesisStreamAdvanced/MultipleVoices_Streaming/StreamingVoice_echo$(NC)"; \ | ||
| exit 1; \ | ||
| fi; \ | ||
| if [ -n "$(PATTERN)" ]; then \ | ||
| echo "$(CYAN)Running tests matching '$(PATTERN)' across all providers...$(NC)"; \ | ||
| REPORT_FILE="$(TEST_REPORTS_DIR)/core-all-$(PATTERN).xml"; \ | ||
| cd core && GOWORK=off gotestsum \ | ||
| --format=$(GOTESTSUM_FORMAT) \ | ||
| --junitfile=../$$REPORT_FILE \ | ||
| -- -v -run ".*$(PATTERN).*" ./providers/... || TEST_FAILED=1; \ | ||
| else \ | ||
| REPORT_FILE="$(TEST_REPORTS_DIR)/core-all.xml"; \ | ||
| cd core && GOWORK=off gotestsum \ | ||
| --format=$(GOTESTSUM_FORMAT) \ | ||
| --junitfile=../$$REPORT_FILE \ | ||
| -- -v ./providers/... || TEST_FAILED=1; \ | ||
| fi; \ | ||
| cd ..; \ | ||
| $(MAKE) cleanup-junit-xml REPORT_FILE=$$REPORT_FILE; \ | ||
| if [ -z "$$CI" ] && [ -z "$$GITHUB_ACTIONS" ] && [ -z "$$GITLAB_CI" ] && [ -z "$$CIRCLECI" ] && [ -z "$$JENKINS_HOME" ]; then \ | ||
|
|
@@ -569,12 +606,17 @@ test-chatbot: ## Run interactive chatbot integration test (Usage: RUN_CHATBOT_TE | |
| fi | ||
| @cd core && RUN_CHATBOT_TEST=1 go test -v -run TestChatbot | ||
|
|
||
| test-integrations: ## Run Python integration tests (Usage: make test-integrations [INTEGRATION=openai] [TESTCASE=test_name] [PATTERN=substring] [VERBOSE=1]) | ||
| @echo "$(GREEN)Running Python integration tests...$(NC)" | ||
| @if [ ! -d "tests/integrations" ]; then \ | ||
| echo "$(RED)Error: tests/integrations directory not found$(NC)"; \ | ||
| exit 1; \ | ||
| fi; \ | ||
| if [ -n "$(PATTERN)" ] && [ -n "$(TESTCASE)" ]; then \ | ||
| echo "$(RED)Error: PATTERN and TESTCASE are mutually exclusive$(NC)"; \ | ||
| echo "$(YELLOW)Use PATTERN for substring matching or TESTCASE for exact match$(NC)"; \ | ||
| exit 1; \ | ||
| fi; \ | ||
| if [ -n "$(TESTCASE)" ] && [ -z "$(INTEGRATION)" ]; then \ | ||
| echo "$(RED)Error: TESTCASE requires INTEGRATION to be specified$(NC)"; \ | ||
| echo "$(YELLOW)Usage: make test-integrations INTEGRATION=anthropic TESTCASE=test_05_end2end_tool_calling$(NC)"; \ | ||
|
|
@@ -633,13 +675,21 @@ test-integrations: ## Run Python integration tests (Usage: make test-integration | |
| if [ -n "$(TESTCASE)" ]; then \ | ||
| echo "$(CYAN)Running $(INTEGRATION) integration test: $(TESTCASE)...$(NC)"; \ | ||
| cd tests/integrations && pytest tests/test_$(INTEGRATION).py::$(TESTCASE) $(if $(VERBOSE),-v,-q) || TEST_FAILED=1; \ | ||
| elif [ -n "$(PATTERN)" ]; then \ | ||
| echo "$(CYAN)Running $(INTEGRATION) integration tests matching '$(PATTERN)'...$(NC)"; \ | ||
| cd tests/integrations && pytest tests/test_$(INTEGRATION).py -k "$(PATTERN)" $(if $(VERBOSE),-v,-q) || TEST_FAILED=1; \ | ||
| else \ | ||
| echo "$(CYAN)Running $(INTEGRATION) integration tests...$(NC)"; \ | ||
| cd tests/integrations && pytest tests/test_$(INTEGRATION).py $(if $(VERBOSE),-v,-q) || TEST_FAILED=1; \ | ||
| fi; \ | ||
| else \ | ||
| if [ -n "$(PATTERN)" ]; then \ | ||
| echo "$(CYAN)Running all integration tests matching '$(PATTERN)'...$(NC)"; \ | ||
| cd tests/integrations && pytest -k "$(PATTERN)" $(if $(VERBOSE),-v,-q) || TEST_FAILED=1; \ | ||
| else \ | ||
| echo "$(CYAN)Running all integration tests...$(NC)"; \ | ||
| cd tests/integrations && pytest $(if $(VERBOSE),-v,-q) || TEST_FAILED=1; \ | ||
| fi; \ | ||
| fi; \ | ||
| else \ | ||
| echo "$(CYAN)Using uv (fast mode)$(NC)"; \ | ||
|
|
@@ -652,13 +702,21 @@ test-integrations: ## Run Python integration tests (Usage: make test-integration | |
| if [ -n "$(TESTCASE)" ]; then \ | ||
| echo "$(CYAN)Running $(INTEGRATION) integration test: $(TESTCASE)...$(NC)"; \ | ||
| uv run pytest tests/test_$(INTEGRATION).py::$(TESTCASE) $(if $(VERBOSE),-v,-q) || TEST_FAILED=1; \ | ||
| elif [ -n "$(PATTERN)" ]; then \ | ||
| echo "$(CYAN)Running $(INTEGRATION) integration tests matching '$(PATTERN)'...$(NC)"; \ | ||
| uv run pytest tests/test_$(INTEGRATION).py -k "$(PATTERN)" $(if $(VERBOSE),-v,-q) || TEST_FAILED=1; \ | ||
| else \ | ||
| echo "$(CYAN)Running $(INTEGRATION) integration tests...$(NC)"; \ | ||
| uv run pytest tests/test_$(INTEGRATION).py $(if $(VERBOSE),-v,-q) || TEST_FAILED=1; \ | ||
| fi; \ | ||
| else \ | ||
| if [ -n "$(PATTERN)" ]; then \ | ||
| echo "$(CYAN)Running all integration tests matching '$(PATTERN)'...$(NC)"; \ | ||
| uv run pytest -k "$(PATTERN)" $(if $(VERBOSE),-v,-q) || TEST_FAILED=1; \ | ||
| else \ | ||
| echo "$(CYAN)Running all integration tests...$(NC)"; \ | ||
| uv run pytest $(if $(VERBOSE),-v,-q) || TEST_FAILED=1; \ | ||
| fi; \ | ||
| fi; \ | ||
| fi; \ | ||
| if [ $$BIFROST_STARTED -eq 1 ] && [ -n "$$BIFROST_PID" ]; then \ | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Verify SDK URL availability—the primary source does not host macOS 12.3.
The phracker/MacOSX-SDKs repository contains SDKs compiled from various Xcode releases, covering up to MacOSX11.3.sdk. The script's primary URL references version 12.3 from this repository, which is unavailable. The joseluisq/macosx-sdks repository provides the macOS 12.3 SDK at https://github.com/joseluisq/macosx-sdks/releases/download/12.3/MacOSX12.3.sdk.tar.xz, as do alternative sources. Ensure your download script has appropriate fallback handling or update to use an available source. The SDK upgrade from 11.3 to 12.3 may also affect your project's minimum supported macOS version for built binaries.
🤖 Prompt for AI Agents