From f14c7ff7f0039c75e342da1ebfbf2146c5d0f842 Mon Sep 17 00:00:00 2001 From: sAchin-680 Date: Mon, 14 Apr 2025 21:24:59 +0000 Subject: [PATCH] ci: extend merge freeze to '[chore] Update core dependencies' PRs on contrib Signed-off-by: sAchin-680 --- .github/workflows/scripts/check-merge-freeze.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/scripts/check-merge-freeze.sh b/.github/workflows/scripts/check-merge-freeze.sh index 9cb59dd80b3..a90492a120d 100755 --- a/.github/workflows/scripts/check-merge-freeze.sh +++ b/.github/workflows/scripts/check-merge-freeze.sh @@ -3,9 +3,18 @@ # Copyright The OpenTelemetry Authors # SPDX-License-Identifier: Apache-2.0 +# Check for [chore] Prepare release PRs in core repo BLOCKERS=$( gh pr list -A opentelemetrybot -S "[chore] Prepare release" --json url -q '.[].url' -R "${REPO}" ) + +# Check for [chore] Update core dependencies PRs in opentelemetry-collector-contrib +CONTRIB_REPO="open-telemetry/opentelemetry-collector-contrib" +CONTRIB_BLOCKERS=$( gh pr list -A opentelemetrybot -S "[chore] Update core dependencies" --json url -q '.[].url' -R "${CONTRIB_REPO}" ) + +# Combine both blockers +BLOCKERS="${BLOCKERS}${BLOCKERS:+ }${CONTRIB_BLOCKERS}" + if [ "${BLOCKERS}" != "" ]; then - echo "Merging in main is frozen, as there are open \"Prepare release\" PRs: ${BLOCKERS}" + echo "Merging in main is frozen, as there are open release/update PRs: ${BLOCKERS}" echo "If you believe this is no longer true, re-run this job to unblock your PR." exit 1 fi