diff --git a/.github/scripts/auto-label-pr/detectors.js b/.github/scripts/auto-label-pr/detectors.js index b2a7665e25..527a08da85 100644 --- a/.github/scripts/auto-label-pr/detectors.js +++ b/.github/scripts/auto-label-pr/detectors.js @@ -7,7 +7,7 @@ const { hasDashboardChanges, hasGitHubActionsChanges, } = require('../detect-tags'); -const { fetchCodeowners, getEffectiveOwners } = require('../codeowners'); +const { fetchCodeowners } = require('../codeowners'); // Strategy: Merge branch detection async function detectMergeBranch(context) { diff --git a/.github/workflows/codeowner-approved-label.yml b/.github/workflows/codeowner-approved-label.yml index 7ba9f126c2..b45cdd82ec 100644 --- a/.github/workflows/codeowner-approved-label.yml +++ b/.github/workflows/codeowner-approved-label.yml @@ -105,7 +105,7 @@ jobs: const latestReviewByUser = new Map(); for (const review of reviews) { // Skip bot reviews and comment-only reviews - if (!review.user || review.state === 'COMMENTED') continue; + if (!review.user || review.user.type === 'Bot' || review.state === 'COMMENTED') continue; latestReviewByUser.set(review.user.login, review); } @@ -156,6 +156,6 @@ jobs: } } catch (error) { - console.log('Failed to process codeowner approval label:', error.message); console.error(error); + core.setFailed(`Failed to process codeowner approval label: ${error.message}`); }