From 1fb6cb929825e18b3925e18b650904cc9df254e5 Mon Sep 17 00:00:00 2001 From: Yannick Augenstein Date: Mon, 20 Oct 2025 09:41:23 +0200 Subject: [PATCH] fix(ci): Relax branch-name lint to allow prefixes fix(ci): capture branch name for push events --- .github/workflows/tidy3d-python-client-tests.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tidy3d-python-client-tests.yml b/.github/workflows/tidy3d-python-client-tests.yml index 58319545dd..79aa5927c0 100644 --- a/.github/workflows/tidy3d-python-client-tests.yml +++ b/.github/workflows/tidy3d-python-client-tests.yml @@ -216,6 +216,10 @@ jobs: id: extract-branch-name run: | BRANCH_NAME="${GITHUB_HEAD_REF}" + if [[ -z "$BRANCH_NAME" ]]; then + BRANCH_NAME="${GITHUB_REF_NAME:-${GITHUB_REF#refs/heads/}}" + echo "(fallback) Using ref-derived branch name: $BRANCH_NAME" + fi echo "Branch name: $BRANCH_NAME" echo "branch_name=$BRANCH_NAME" >> $GITHUB_OUTPUT @@ -226,7 +230,10 @@ jobs: run: | BRANCH_NAME="${STEPS_EXTRACT_BRANCH_NAME_OUTPUTS_BRANCH_NAME}" echo $BRANCH_NAME - JIRA_PATTERN='[A-Z]{2,}-[0-9]+' + # Allow only Jira keys from known projects, even if the branch has an author prefix + ALLOWED_JIRA_PROJECTS=("FXC" "SCEM") + JIRA_PROJECT_PATTERN=$(IFS='|'; echo "${ALLOWED_JIRA_PROJECTS[*]}") + JIRA_PATTERN="(${JIRA_PROJECT_PATTERN})-[0-9]+" # List of exempt prefixes (case-insensitive) EXEMPT_PREFIXES=("chore" "hotfix" "daily-chore") @@ -250,6 +257,7 @@ jobs: echo "✅ Jira key found in PR-title: ${BASH_REMATCH[0]}" else echo "❌ No Jira key found in branch name and PR title" + echo "ℹ️ Expected Jira key prefixes: ${ALLOWED_JIRA_PROJECTS[*]}" exit 1 fi fi @@ -684,4 +692,3 @@ jobs: - name: all-checks-passed if: ${{ success() }} run: echo "✅ All required jobs passed!" -