From cc4c47d71210bd961d0007f0b47fdbfed2b90877 Mon Sep 17 00:00:00 2001 From: Dimitrios Liappis Date: Wed, 12 Feb 2025 16:17:52 +0200 Subject: [PATCH] Fix conflicts --- .buildkite/scripts/common/trigger-pipeline-generate-steps.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.buildkite/scripts/common/trigger-pipeline-generate-steps.sh b/.buildkite/scripts/common/trigger-pipeline-generate-steps.sh index e6c7ef240c3..f0dc4263aa2 100755 --- a/.buildkite/scripts/common/trigger-pipeline-generate-steps.sh +++ b/.buildkite/scripts/common/trigger-pipeline-generate-steps.sh @@ -12,7 +12,7 @@ set -eo pipefail # https://github.com/elastic/ingest-dev/issues/2664 # ******************************************************* -ACTIVE_BRANCHES_URL="https://raw.githubusercontent.com/elastic/logstash/main/ci/branches.json" +ACTIVE_BRANCHES_URL="https://storage.googleapis.com/artifacts-api/snapshots/branches.json" EXCLUDE_BRANCHES_ARRAY=() BRANCHES=() @@ -63,7 +63,7 @@ exclude_branches_to_array set -u set +e # pull releaseable branches from $ACTIVE_BRANCHES_URL -readarray -t ELIGIBLE_BRANCHES < <(curl --retry-all-errors --retry 5 --retry-delay 5 -fsSL $ACTIVE_BRANCHES_URL | jq -r '.branches[].branch') +readarray -t ELIGIBLE_BRANCHES < <(curl --retry-all-errors --retry 5 --retry-delay 5 -fsSL $ACTIVE_BRANCHES_URL | jq -r '.branches[]') if [[ $? -ne 0 ]]; then echo "There was an error downloading or parsing the json output from [$ACTIVE_BRANCHES_URL]. Exiting." exit 1