From bc7707e9cae151e5abad0b9607c34efeaa2f1608 Mon Sep 17 00:00:00 2001 From: Ashwin Bharambe Date: Thu, 30 Oct 2025 21:25:42 -0700 Subject: [PATCH] ci: standardize release branch pattern to release-X.Y.x Update all CI workflows and actions to use the standardized release branch naming convention 'release-X.Y.x' (e.g., release-0.3.x) instead of matching multiple numeric patterns. Changes: - Update workflow triggers to match 'release-[0-9]+.[0-9]+.x' pattern - Update bash regex in setup-test-environment to match new format - Simplifies branch pattern from multiple variants to single standard --- .github/actions/setup-test-environment/action.yml | 2 +- .github/workflows/integration-auth-tests.yml | 8 ++------ .github/workflows/integration-sql-store-tests.yml | 8 ++------ .github/workflows/integration-tests.yml | 8 ++------ .github/workflows/integration-vector-io-tests.yml | 8 ++------ .github/workflows/pre-commit.yml | 4 +--- .github/workflows/unit-tests.yml | 8 ++------ 7 files changed, 12 insertions(+), 34 deletions(-) diff --git a/.github/actions/setup-test-environment/action.yml b/.github/actions/setup-test-environment/action.yml index 81b6d0178..27d0943fe 100644 --- a/.github/actions/setup-test-environment/action.yml +++ b/.github/actions/setup-test-environment/action.yml @@ -47,7 +47,7 @@ runs: # Check if PR is targeting a release branch TARGET_BRANCH="${{ github.base_ref }}" - if [[ "$TARGET_BRANCH" =~ ^release-([0-9]+\.){1,3}[0-9]+$ ]]; then + if [[ "$TARGET_BRANCH" =~ ^release-[0-9]+\.[0-9]+\.x$ ]]; then echo "PR targets release branch: $TARGET_BRANCH" echo "Checking if matching branch exists in llama-stack-client-python..." diff --git a/.github/workflows/integration-auth-tests.yml b/.github/workflows/integration-auth-tests.yml index 7eda095a3..c427c07b9 100644 --- a/.github/workflows/integration-auth-tests.yml +++ b/.github/workflows/integration-auth-tests.yml @@ -6,15 +6,11 @@ on: push: branches: - main - - 'release-[0-9]+.[0-9]+.[0-9]+.[0-9]+' - - 'release-[0-9]+.[0-9]+.[0-9]+' - - 'release-[0-9]+.[0-9]+' + - 'release-[0-9]+.[0-9]+.x' pull_request: branches: - main - - 'release-[0-9]+.[0-9]+.[0-9]+.[0-9]+' - - 'release-[0-9]+.[0-9]+.[0-9]+' - - 'release-[0-9]+.[0-9]+' + - 'release-[0-9]+.[0-9]+.x' paths: - 'distributions/**' - 'llama_stack/**' diff --git a/.github/workflows/integration-sql-store-tests.yml b/.github/workflows/integration-sql-store-tests.yml index ae1f243c1..f385f7ebf 100644 --- a/.github/workflows/integration-sql-store-tests.yml +++ b/.github/workflows/integration-sql-store-tests.yml @@ -6,15 +6,11 @@ on: push: branches: - main - - 'release-[0-9]+.[0-9]+.[0-9]+.[0-9]+' - - 'release-[0-9]+.[0-9]+.[0-9]+' - - 'release-[0-9]+.[0-9]+' + - 'release-[0-9]+.[0-9]+.x' pull_request: branches: - main - - 'release-[0-9]+.[0-9]+.[0-9]+.[0-9]+' - - 'release-[0-9]+.[0-9]+.[0-9]+' - - 'release-[0-9]+.[0-9]+' + - 'release-[0-9]+.[0-9]+.x' paths: - 'llama_stack/providers/utils/sqlstore/**' - 'tests/integration/sqlstore/**' diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 418a06333..49f643c26 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -6,15 +6,11 @@ on: push: branches: - main - - 'release-[0-9]+.[0-9]+.[0-9]+.[0-9]+' - - 'release-[0-9]+.[0-9]+.[0-9]+' - - 'release-[0-9]+.[0-9]+' + - 'release-[0-9]+.[0-9]+.x' pull_request: branches: - main - - 'release-[0-9]+.[0-9]+.[0-9]+.[0-9]+' - - 'release-[0-9]+.[0-9]+.[0-9]+' - - 'release-[0-9]+.[0-9]+' + - 'release-[0-9]+.[0-9]+.x' types: [opened, synchronize, reopened] paths: - 'llama_stack/**' diff --git a/.github/workflows/integration-vector-io-tests.yml b/.github/workflows/integration-vector-io-tests.yml index 815b826b0..936aa9b1d 100644 --- a/.github/workflows/integration-vector-io-tests.yml +++ b/.github/workflows/integration-vector-io-tests.yml @@ -6,15 +6,11 @@ on: push: branches: - main - - 'release-[0-9]+.[0-9]+.[0-9]+.[0-9]+' - - 'release-[0-9]+.[0-9]+.[0-9]+' - - 'release-[0-9]+.[0-9]+' + - 'release-[0-9]+.[0-9]+.x' pull_request: branches: - main - - 'release-[0-9]+.[0-9]+.[0-9]+.[0-9]+' - - 'release-[0-9]+.[0-9]+.[0-9]+' - - 'release-[0-9]+.[0-9]+' + - 'release-[0-9]+.[0-9]+.x' paths: - 'llama_stack/**' - '!llama_stack/ui/**' diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index eb729b96b..38fb9e479 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -7,9 +7,7 @@ on: push: branches: - main - - 'release-[0-9]+.[0-9]+.[0-9]+.[0-9]+' - - 'release-[0-9]+.[0-9]+.[0-9]+' - - 'release-[0-9]+.[0-9]+' + - 'release-[0-9]+.[0-9]+.x' concurrency: group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }} diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index f3272390f..95d3577ab 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -6,15 +6,11 @@ on: push: branches: - main - - 'release-[0-9]+.[0-9]+.[0-9]+.[0-9]+' - - 'release-[0-9]+.[0-9]+.[0-9]+' - - 'release-[0-9]+.[0-9]+' + - 'release-[0-9]+.[0-9]+.x' pull_request: branches: - main - - 'release-[0-9]+.[0-9]+.[0-9]+.[0-9]+' - - 'release-[0-9]+.[0-9]+.[0-9]+' - - 'release-[0-9]+.[0-9]+' + - 'release-[0-9]+.[0-9]+.x' paths: - 'llama_stack/**' - '!llama_stack/ui/**'