|
| 1 | +name: Create Pre-Release PR from Milestone |
| 2 | + |
| 3 | +permissions: |
| 4 | + contents: write |
| 5 | + pull-requests: write |
| 6 | + issues: write |
| 7 | + |
| 8 | +on: |
| 9 | + workflow_dispatch: |
| 10 | + inputs: |
| 11 | + milestone_name: |
| 12 | + description: 'Milestone name to collect closed PRs from' |
| 13 | + required: true |
| 14 | + default: 'v3.8.2' |
| 15 | + target_branch: |
| 16 | + description: 'Target branch to merge the consolidated PR' |
| 17 | + required: true |
| 18 | + default: 'pre-release-v3.8.2' |
| 19 | + |
| 20 | + schedule: |
| 21 | + - cron: '0 2 * * 0' |
| 22 | + |
| 23 | +env: |
| 24 | + MILESTONE_NAME: ${{ github.event.inputs.milestone_name || 'v3.8.2' }} |
| 25 | + TARGET_BRANCH: ${{ github.event.inputs.target_branch || 'pre-release-v3.8.2' }} |
| 26 | + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} |
| 27 | + BOT_TOKEN: ${{ secrets.BOT_TOKEN }} |
| 28 | + LABEL_NAME: cherry-picked |
| 29 | + TEMP_DIR: /tmp # Using /tmp as the temporary directory |
| 30 | + |
| 31 | +jobs: |
| 32 | + cherry_pick_milestone_prs: |
| 33 | + runs-on: ubuntu-latest |
| 34 | + steps: |
| 35 | + - name: Setup temp directory |
| 36 | + run: | |
| 37 | + # Create the temporary directory and initialize necessary files |
| 38 | + mkdir -p ${{ env.TEMP_DIR }} |
| 39 | + touch ${{ env.TEMP_DIR }}/pr_numbers.txt |
| 40 | + touch ${{ env.TEMP_DIR }}/commit_hashes.txt |
| 41 | + touch ${{ env.TEMP_DIR }}/pr_title.txt |
| 42 | + touch ${{ env.TEMP_DIR }}/pr_body.txt |
| 43 | + touch ${{ env.TEMP_DIR }}/created_pr_number.txt |
| 44 | +
|
| 45 | + - name: Checkout repository |
| 46 | + uses: actions/checkout@v4 |
| 47 | + with: |
| 48 | + fetch-depth: 0 |
| 49 | + token: ${{ secrets.BOT_TOKEN }} |
| 50 | + |
| 51 | + - name: Setup Git User for OpenIM-Robot |
| 52 | + run: | |
| 53 | + # Set up Git credentials for the bot |
| 54 | + git config --global user.email "[email protected]" |
| 55 | + git config --global user.name "OpenIM-Robot" |
| 56 | +
|
| 57 | + - name: Fetch Milestone ID and Filter PR Numbers |
| 58 | + env: |
| 59 | + MILESTONE_NAME: ${{ env.MILESTONE_NAME }} |
| 60 | + run: | |
| 61 | + # Fetch milestone details and extract milestone ID |
| 62 | + milestones=$(curl -s -H "Authorization: token $BOT_TOKEN" \ |
| 63 | + -H "Accept: application/vnd.github+json" \ |
| 64 | + "https://api.github.com/repos/${{ github.repository }}/milestones") |
| 65 | + milestone_id=$(echo "$milestones" | grep -B3 "\"title\": \"$MILESTONE_NAME\"" | grep '"number":' | head -n1 | grep -o '[0-9]\+') |
| 66 | + if [ -z "$milestone_id" ]; then |
| 67 | + echo "Milestone '$MILESTONE_NAME' not found. Exiting." |
| 68 | + exit 1 |
| 69 | + fi |
| 70 | + echo "Milestone ID: $milestone_id" |
| 71 | + echo "MILESTONE_ID=$milestone_id" >> $GITHUB_ENV |
| 72 | +
|
| 73 | + # Fetch issues for the milestone |
| 74 | + issues=$(curl -s -H "Authorization: token $BOT_TOKEN" \ |
| 75 | + -H "Accept: application/vnd.github+json" \ |
| 76 | + "https://api.github.com/repos/${{ github.repository }}/issues?milestone=$milestone_id&state=closed&per_page=100") |
| 77 | +
|
| 78 | + > ${{ env.TEMP_DIR }}/pr_numbers.txt |
| 79 | +
|
| 80 | + # Filter PRs that do not have the 'cherry-picked' label |
| 81 | + for pr_number in $(echo "$issues" | jq -r '.[] | select(.pull_request != null) | .number'); do |
| 82 | + labels=$(curl -s -H "Authorization: token $BOT_TOKEN" \ |
| 83 | + -H "Accept: application/vnd.github+json" \ |
| 84 | + "https://api.github.com/repos/${{ github.repository }}/issues/$pr_number/labels" | jq -r '.[].name') |
| 85 | +
|
| 86 | + if ! echo "$labels" | grep -q "${LABEL_NAME}"; then |
| 87 | + echo "PR #$pr_number does not have the 'cherry-picked' label. Adding to the list." |
| 88 | + echo "$pr_number" >> ${{ env.TEMP_DIR }}/pr_numbers.txt |
| 89 | + else |
| 90 | + echo "PR #$pr_number already has the 'cherry-picked' label. Skipping." |
| 91 | + fi |
| 92 | + done |
| 93 | +
|
| 94 | + # Sort the filtered PR numbers |
| 95 | + sort -n ${{ env.TEMP_DIR }}/pr_numbers.txt -o ${{ env.TEMP_DIR }}/pr_numbers.txt |
| 96 | +
|
| 97 | + echo "Filtered and sorted PR numbers:" |
| 98 | + cat ${{ env.TEMP_DIR }}/pr_numbers.txt || echo "No closed PR numbers found for milestone." |
| 99 | +
|
| 100 | + - name: Fetch Merge Commits for PRs and Generate Title and Body |
| 101 | + run: | |
| 102 | + # Ensure the files are initialized |
| 103 | + > ${{ env.TEMP_DIR }}/commit_hashes.txt |
| 104 | + > ${{ env.TEMP_DIR }}/pr_title.txt |
| 105 | + > ${{ env.TEMP_DIR }}/pr_body.txt |
| 106 | +
|
| 107 | + # Write description to the PR body |
| 108 | + echo "### Description:" >> ${{ env.TEMP_DIR }}/pr_body.txt |
| 109 | + echo "Merging PRs from milestone \`$MILESTONE_NAME\` into target branch \`$TARGET_BRANCH\`." >> ${{ env.TEMP_DIR }}/pr_body.txt |
| 110 | + echo "" >> ${{ env.TEMP_DIR }}/pr_body.txt |
| 111 | + echo "### Need Merge PRs:" >> ${{ env.TEMP_DIR }}/pr_body.txt |
| 112 | +
|
| 113 | + pr_numbers_in_title="" |
| 114 | +
|
| 115 | + # Process sorted PR numbers and generate commit hashes |
| 116 | + for pr_number in $(cat ${{ env.TEMP_DIR }}/pr_numbers.txt); do |
| 117 | + echo "Processing PR #$pr_number" |
| 118 | + pr_details=$(curl -s -H "Authorization: token $BOT_TOKEN" \ |
| 119 | + -H "Accept: application/vnd.github+json" \ |
| 120 | + "https://api.github.com/repos/${{ github.repository }}/pulls/$pr_number") |
| 121 | + pr_title=$(echo "$pr_details" | jq -r '.title') |
| 122 | + merge_commit=$(echo "$pr_details" | jq -r '.merge_commit_sha') |
| 123 | + short_commit_hash=$(echo "$merge_commit" | cut -c 1-7) |
| 124 | +
|
| 125 | + # Append PR details to the body |
| 126 | + echo "- $pr_title: (#$pr_number) ($short_commit_hash)" >> ${{ env.TEMP_DIR }}/pr_body.txt |
| 127 | +
|
| 128 | + if [ "$merge_commit" != "null" ];then |
| 129 | + echo "$merge_commit" >> ${{ env.TEMP_DIR }}/commit_hashes.txt |
| 130 | + echo "#$pr_number" >> ${{ env.TEMP_DIR }}/pr_title.txt |
| 131 | + pr_numbers_in_title="$pr_numbers_in_title #$pr_number" |
| 132 | + fi |
| 133 | + done |
| 134 | +
|
| 135 | + commit_hashes=$(cat ${{ env.TEMP_DIR }}/commit_hashes.txt | tr '\n' ' ') |
| 136 | + first_commit_hash=$(head -n 1 ${{ env.TEMP_DIR }}/commit_hashes.txt) |
| 137 | + cherry_pick_branch="cherry-pick-${first_commit_hash:0:7}" |
| 138 | + echo "COMMIT_HASHES=$commit_hashes" >> $GITHUB_ENV |
| 139 | + echo "CHERRY_PICK_BRANCH=$cherry_pick_branch" >> $GITHUB_ENV |
| 140 | + echo "pr_numbers_in_title=$pr_numbers_in_title" >> $GITHUB_ENV |
| 141 | +
|
| 142 | + - name: Pull and Cherry-pick Commits, Then Push |
| 143 | + env: |
| 144 | + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} |
| 145 | + BOT_TOKEN: ${{ secrets.BOT_TOKEN }} |
| 146 | + run: | |
| 147 | + # Fetch and pull the latest changes from the target branch |
| 148 | + git fetch origin |
| 149 | + git checkout $TARGET_BRANCH |
| 150 | + git pull origin $TARGET_BRANCH |
| 151 | +
|
| 152 | + # Create a new branch for cherry-picking |
| 153 | + git checkout -b $CHERRY_PICK_BRANCH |
| 154 | +
|
| 155 | + # Cherry-pick the commits and handle conflicts |
| 156 | + for commit_hash in $COMMIT_HASHES; do |
| 157 | + echo "Attempting to cherry-pick commit $commit_hash" |
| 158 | + if ! git cherry-pick "$commit_hash" --strategy=recursive -X theirs; then |
| 159 | + echo "Conflict detected for $commit_hash. Resolving with incoming changes." |
| 160 | + conflict_files=$(git diff --name-only --diff-filter=U) |
| 161 | + echo "Conflicting files:" |
| 162 | + echo "$conflict_files" |
| 163 | +
|
| 164 | + for file in $conflict_files; do |
| 165 | + if [ -f "$file" ]; then |
| 166 | + echo "Resolving conflict for $file" |
| 167 | + git add "$file" |
| 168 | + else |
| 169 | + echo "File $file has been deleted. Skipping." |
| 170 | + git rm "$file" |
| 171 | + fi |
| 172 | + done |
| 173 | +
|
| 174 | + echo "Conflicts resolved. Continuing cherry-pick." |
| 175 | + git cherry-pick --continue |
| 176 | + else |
| 177 | + echo "Cherry-pick successful for commit $commit_hash." |
| 178 | + fi |
| 179 | + done |
| 180 | +
|
| 181 | + # Push the cherry-pick branch to the repository |
| 182 | + git remote set-url origin "https://${BOT_TOKEN}@github.com/${{ github.repository }}.git" |
| 183 | + git push origin $CHERRY_PICK_BRANCH --force |
| 184 | +
|
| 185 | + - name: Create Pull Request |
| 186 | + run: | |
| 187 | + # Prepare and create the PR |
| 188 | + pr_title="deps: Merge ${{ env.pr_numbers_in_title }} PRs into $TARGET_BRANCH" |
| 189 | + pr_body=$(cat ${{ env.TEMP_DIR }}/pr_body.txt) |
| 190 | +
|
| 191 | + echo "Prepared PR title:" |
| 192 | + echo "$pr_title" |
| 193 | + echo "Prepared PR body:" |
| 194 | + echo "$pr_body" |
| 195 | +
|
| 196 | + # Create the PR using the GitHub API |
| 197 | + response=$(curl -s -X POST -H "Authorization: token $BOT_TOKEN" \ |
| 198 | + -H "Accept: application/vnd.github+json" \ |
| 199 | + https://api.github.com/repos/${{ github.repository }}/pulls \ |
| 200 | + -d "$(jq -n --arg title "$pr_title" \ |
| 201 | + --arg head "$CHERRY_PICK_BRANCH" \ |
| 202 | + --arg base "$TARGET_BRANCH" \ |
| 203 | + --arg body "$pr_body" \ |
| 204 | + '{title: $title, head: $head, base: $base, body: $body}')") |
| 205 | +
|
| 206 | + pr_number=$(echo "$response" | jq -r '.number') |
| 207 | + echo "$pr_number" > ${{ env.TEMP_DIR }}/created_pr_number.txt |
| 208 | + echo "Created PR #$pr_number" |
| 209 | +
|
| 210 | + - name: Add Label to Created Pull Request |
| 211 | + run: | |
| 212 | + # Add 'milestone-merge' label to the created PR |
| 213 | + pr_number=$(cat ${{ env.TEMP_DIR }}/created_pr_number.txt) |
| 214 | + echo "Adding label to PR #$pr_number" |
| 215 | +
|
| 216 | + curl -s -X POST -H "Authorization: token $GITHUB_TOKEN" \ |
| 217 | + -H "Accept: application/vnd.github+json" \ |
| 218 | + -d '{"labels": ["milestone-merge"]}' \ |
| 219 | + "https://api.github.com/repos/${{ github.repository }}/issues/$pr_number/labels" |
| 220 | +
|
| 221 | + echo "Added 'milestone-merge' label to PR #$pr_number." |
0 commit comments