|
15 | 15 | | `/cherry-pick target-branch`| Cherry-picks the PR changes to the target branch | |
16 | 16 | | `/rebase` | Rebases the PR branch on the base branch | |
17 | 17 | | `/help` | Shows this help message | |
| 18 | +
|
| 19 | +
|
| 20 | +*Automated by the [PAC Boussole](https://github.com/openshift-pipelines/pac-boussole) 🧭* |
| 21 | +
|
18 | 22 | """ |
19 | 23 |
|
20 | 24 | APPROVED_TEMPLATE = """ |
| 25 | +Thank you for your valuable contribution! 🎉 |
| 26 | +
|
21 | 27 | ### ✅ Pull Request Approved |
22 | 28 |
|
23 | | -**Approval Status:** |
| 29 | +*Approval Status:* |
24 | 30 | * Required Approvals: {threshold} |
25 | 31 | * Current Approvals: {valid_votes} |
26 | 32 |
|
27 | | -### 👥 Approved By: |
28 | | -| Reviewer | Permission | Status | |
29 | | -|----------|------------|--------| |
| 33 | +### 👥 Reviewers Who Approved: |
| 34 | +| Reviewer | Permission Level | Approval Status | |
| 35 | +|----------|------------------|----------------| |
30 | 36 | {users_table} |
31 | 37 |
|
32 | 38 | ### 📝 Next Steps |
33 | | -* All required checks must pass |
34 | | -* Branch protection rules apply |
35 | | -* Get a maintainer to use the `/merge` command to merge the PR |
| 39 | +* Ensure all required checks pass |
| 40 | +* Comply with branch protection rules |
| 41 | +* Request a maintainer to merge using the `/merge` command (or merge it |
| 42 | +directly if you have repository permission). |
| 43 | +
|
| 44 | +
|
| 45 | +*Automated by the [PAC Boussole](https://github.com/openshift-pipelines/pac-boussole) 🧭* |
36 | 46 |
|
37 | | -Thank you for your contributions! 🎉 |
38 | 47 | """ |
39 | 48 |
|
40 | 49 | LGTM_BREAKDOWN_TEMPLATE = """ |
|
43 | 52 | * **Current valid votes:** {valid_votes}/{threshold} |
44 | 53 | * **Voting required for approval:** {threshold} |
45 | 54 |
|
46 | | -**Votes Summary:** |
| 55 | +*Votes Summary:* |
47 | 56 | | Reviewer | Permission | Valid Vote | |
48 | 57 | |----------|------------|------------| |
49 | 58 | {users_table} |
50 | 59 |
|
| 60 | +
|
| 61 | +*Automated by the [PAC Boussole](https://github.com/openshift-pipelines/pac-boussole) 🧭* |
| 62 | +
|
51 | 63 | """ |
52 | 64 |
|
53 | 65 | SUCCESS_MERGED = """ |
54 | 66 | ### ✅ PR Successfully Merged |
55 | 67 |
|
| 68 | +Thank you again for your valuable contribution! 🎉 |
| 69 | +
|
56 | 70 | * Merge method: `{merge_method}` |
57 | | -* Merged by: **@{comment_sender}** |
58 | | -* Total approvals: **{valid_votes}/{lgtm_threshold}** |
| 71 | +* Merged by: **@{comment_sender}* |
| 72 | +* Total approvals: **{valid_votes}/{lgtm_threshold}* |
59 | 73 |
|
60 | | -**Approvals Summary:** |
| 74 | +*Approvals Summary:* |
61 | 75 | | Reviewer | Permission | Status | |
62 | | -|----------|------------|--------| |
63 | | -{users_table} |
| 76 | +
|
| 77 | +*{users_table}* |
| 78 | +
|
| 79 | +
|
| 80 | +
|
| 81 | +*Automated by the [PAC Boussole](https://github.com/openshift-pipelines/pac-boussole) 🧭* |
| 82 | +
|
64 | 83 | """ |
65 | 84 |
|
66 | 85 | # Error and status message templates |
67 | 86 | PERMISSION_CHECK_ERROR = """ |
68 | 87 | ### ⚠️ Permission Check Failed |
69 | 88 |
|
70 | | -Unable to verify permissions for user **@{user}** |
| 89 | +Unable to verify permissions for user **@{user}* |
71 | 90 | * API Response Status: `{status_code}` |
72 | 91 | * This might be due to: |
73 | 92 | * User not being a repository collaborator |
74 | 93 | * Invalid authentication |
75 | 94 | * Rate limiting |
76 | 95 |
|
77 | 96 | Please check user permissions and try again. |
| 97 | +
|
| 98 | +
|
| 99 | +*Automated by the [PAC Boussole](https://github.com/openshift-pipelines/pac-boussole) 🧭* |
| 100 | +
|
78 | 101 | """ |
79 | 102 |
|
80 | 103 | PERMISSION_DATA_MISSING = """ |
81 | 104 | ### ❌ Permission Data Missing |
82 | 105 |
|
83 | | -Failed to retrieve permission level for user **@{user}** |
| 106 | +Failed to retrieve permission level for user **@{user}* |
84 | 107 | * Received empty permission data from GitHub API |
85 | 108 | * This might indicate an API response format change |
86 | 109 | * Please contact repository administrators for assistance |
| 110 | +
|
| 111 | +
|
| 112 | +*Automated by the [PAC Boussole](https://github.com/openshift-pipelines/pac-boussole) 🧭* |
| 113 | +
|
87 | 114 | """ |
88 | 115 |
|
89 | 116 | COMMENTS_FETCH_ERROR = """ |
|
93 | 120 | * Status Code: `{status_code}` |
94 | 121 | * Response: `{response_text}` |
95 | 122 |
|
96 | | -**Troubleshooting Steps:** |
| 123 | +*Troubleshooting Steps:* |
97 | 124 | 1. Check your authentication token |
98 | 125 | 2. Verify PR number: `{pr_num}` |
99 | 126 | 3. Ensure the PR hasn't been closed or deleted |
| 127 | +
|
| 128 | +
|
| 129 | +*Automated by the [PAC Boussole](https://github.com/openshift-pipelines/pac-boussole) 🧭* |
| 130 | +
|
100 | 131 | """ |
101 | 132 |
|
102 | 133 | SELF_APPROVAL_ERROR = """ |
|
107 | 138 | * Please [delete the comment]({comment_url}) before continuing. |
108 | 139 |
|
109 | 140 | Please wait for reviews from other team members. |
| 141 | +
|
| 142 | +
|
| 143 | +*Automated by the [PAC Boussole](https://github.com/openshift-pipelines/pac-boussole) 🧭* |
| 144 | +
|
110 | 145 | """ |
111 | 146 |
|
112 | 147 | INSUFFICIENT_PERMISSIONS = """ |
|
117 | 152 | * Required permissions: `{required_permissions}` |
118 | 153 |
|
119 | 154 | Please request assistance from a repository maintainer. |
| 155 | +
|
| 156 | +*Automated by the [PAC Boussole](https://github.com/openshift-pipelines/pac-boussole) 🧭* |
120 | 157 | """ |
121 | 158 |
|
122 | 159 | NOT_ENOUGH_LGTM = """ |
123 | 160 | ### ❌ Insufficient Approvals |
124 | 161 |
|
125 | | -* Current valid LGTM votes: **{valid_votes}** |
126 | | -* Required votes: **{threshold}** |
| 162 | +* Current valid LGTM votes: **{valid_votes}* |
| 163 | +* Required votes: **{threshold}* |
127 | 164 |
|
128 | 165 | Please obtain additional approvals before merging. |
| 166 | +
|
| 167 | +
|
| 168 | +*Automated by the [PAC Boussole](https://github.com/openshift-pipelines/pac-boussole) 🧭* |
| 169 | +
|
129 | 170 | """ |
130 | 171 |
|
131 | 172 | MERGE_FAILED = """ |
|
135 | 176 | * Status Code: `{status_code}` |
136 | 177 | * Error: `{error_text}` |
137 | 178 |
|
138 | | -**Possible causes:** |
| 179 | +*Possible causes:* |
139 | 180 | * Branch protection rules not satisfied |
140 | 181 | * Merge conflicts present |
141 | 182 | * Required checks failing |
142 | 183 |
|
143 | 184 | Please resolve any issues and try again. |
| 185 | +
|
| 186 | +*Automated by the [PAC Boussole](https://github.com/openshift-pipelines/pac-boussole) 🧭* |
144 | 187 | """ |
145 | 188 |
|
146 | 189 | # Add new error message template for cherry-pick |
|
151 | 194 | * Status Code: `{status_code}` |
152 | 195 | * Error: `{error_text}` |
153 | 196 |
|
154 | | -**Possible causes:** |
| 197 | +*Possible causes:* |
155 | 198 | * Merge conflicts |
156 | 199 | * Branch protection rules |
157 | 200 | * Invalid branch name |
158 | 201 | * Missing permissions |
159 | 202 |
|
160 | 203 | Please resolve any issues and try again. |
| 204 | +
|
| 205 | +*Automated by the [PAC Boussole](https://github.com/openshift-pipelines/pac-boussole) 🧭* |
| 206 | +
|
161 | 207 | """ |
162 | 208 |
|
163 | 209 | CHERRY_PICK_SUCCESS = """ |
164 | 210 | ### ✅ Cherry Pick Successful |
165 | 211 |
|
166 | 212 | Successfully cherry-picked changes from PR #{source_pr} to branch `{target_branch}`. |
167 | 213 |
|
168 | | -**Details:** |
| 214 | +*Details:* |
169 | 215 | * Source PR: #{source_pr} |
170 | 216 | * Target Branch: `{target_branch}` |
171 | 217 | * Cherry-picked by: @{user} |
172 | 218 | * New commit SHA: `{commit_sha}` |
| 219 | +
|
| 220 | +
|
| 221 | +*Automated by the [PAC Boussole](https://github.com/openshift-pipelines/pac-boussole) 🧭* |
| 222 | +
|
173 | 223 | """ |
174 | 224 |
|
175 | 225 | CHERRY_PICK_CONFLICT = """ |
|
196 | 246 | ```shell |
197 | 247 | git push YOURFORKREMOTE resolve-cherry-pick-{self.pr_num} --force-with-lease |
198 | 248 | gh pr create --base {target_branch} --head YOURFORK:resolve-cherry-pick-{self.pr_num} |
| 249 | +
|
199 | 250 | ``` |
200 | 251 |
|
201 | 252 | Need assistance? Please contact the repository maintainers. |
| 253 | +
|
| 254 | +
|
| 255 | +*Automated by the [PAC Boussole](https://github.com/openshift-pipelines/pac-boussole) 🧭* |
| 256 | +
|
202 | 257 | """ |
203 | 258 |
|
204 | 259 | REVIEW_REQUESTED = """{greeting} |
|
213 | 268 | ⏰ Take your time - there's no immediate rush, but a timely review would be |
214 | 269 | appreciated. |
215 | 270 |
|
216 | | -Thank you for your help! 🙌""" |
| 271 | +Thank you for your help! 🙌 |
| 272 | +
|
| 273 | +
|
| 274 | +*Automated by the [PAC Boussole](https://github.com/openshift-pipelines/pac-boussole) 🧭* |
| 275 | +
|
| 276 | +""" |
217 | 277 |
|
218 | 278 |
|
219 | 279 | CHECKS_NOT_PASSED = """⚠️ Cannot merge PR: Some required checks haven't completed successfully. |
220 | 280 |
|
221 | 281 | {status_table} |
222 | 282 |
|
223 | 283 | 🔍 Please ensure all checks pass before merging. |
224 | | -💡 Tip: Review the failing checks above and address any issues.""" |
| 284 | +💡 Tip: Review the failing checks above and address any issues. |
| 285 | +
|
| 286 | +*Automated by the [PAC Boussole](https://github.com/openshift-pipelines/pac-boussole) 🧭* |
| 287 | +""" |
0 commit comments