diff --git a/tools/release/publish_release.sh b/tools/release/publish_release.sh index d8af180f97..9933448818 100755 --- a/tools/release/publish_release.sh +++ b/tools/release/publish_release.sh @@ -364,7 +364,7 @@ changelog_and_versions() { gh pr create -f -B $source_branch gh workflow run goreleaser-snapshot-fleet.yaml --ref $source_branch # Manually trigger workflow run else - echo "DRYRUN: Would have created Changelog / version pr from $branch_for_changelog to $source_branch" + echo "DRYRUN: Would have created Changelog / verison pr from $branch_for_changelog to $source_branch" fi } @@ -531,10 +531,22 @@ publish() { gh release edit --draft=false --latest $next_tag if [ "$skip_deploy_dogfood" = "false" ]; then - gh workflow run dogfood-deploy.yml -f DOCKER_IMAGE=fleetdm/fleet:$next_ver + if [ "$force" = "false" ]; then + read -r -p "Are you ABSOLUTELY SURE you want to deploy to Dogfood right now?? Check for demo's: [y/n]" response + case "$response" in + [yY][eE][sS]|[yY]) + gh workflow run dogfood-deploy.yml -f DOCKER_IMAGE=fleetdm/fleet:$next_ver + show_spinner 200 + dogfood_deploy=$(gh run list --workflow=dogfood-deploy.yml --status in_progress -L 1 --json url | jq -r '.[] | .url') + echo + ;; + *) + dogfood_deploy="skipped" + echo + ;; + esac + fi fi - show_spinner 200 - dogfood_deploy=$(gh run list --workflow=dogfood-deploy.yml --status in_progress -L 1 --json url | jq -r '.[] | .url') latest_npm=$(npm view fleetctl --json | jq -r '.version' | sed -e 's/^v//') latest_local=$(jq -r '.version' tools/fleetctl-npm/package.json | sed -e 's/^v//') @@ -547,7 +559,7 @@ publish() { fi - issues=$(gh issue list -m $target_milestone --json number | jq -r '.[] | .number') + issues=$(gh issue list -L 500 -m $target_milestone --json number | jq -r '.[] | .number') for iss in $issues; do is_story=$(gh issue view $iss --json labels | jq -r '.labels | .[] | .name' | grep story) # close all non-stories @@ -735,7 +747,7 @@ if [ "$cherry_pick_resolved" = "false" ]; then total_prs=() - issue_list=$(gh issue list --search 'milestone:"'"$target_milestone"'"' --json number | jq -r '.[] | .number') + issue_list=$(gh issue list -L 500 --search 'milestone:"'"$target_milestone"'"' --json number | jq -r '.[] | .number') if [[ "$issue_list" == "" && "$dry_run" == "false" ]]; then echo "Milestone $target_milestone has no target issues, please tie tickets to the milestone to continue" @@ -852,6 +864,8 @@ if [[ "$failed" == "false" ]]; then git checkout main git pull origin main ask "Are you on main? [y/n]" + changelog_and_versions "$update_changelog_prepare_branch"-main main + git checkout $target_branch else echo "DRYRUN: Would have switched to main and pulled latest" fi