@@ -183,6 +183,19 @@ jobs:
183183 }
184184 const currentLabels = new Set(pr.labels.map(l => l.name));
185185 const labelErrors = [];
186+ if (desiredLabel && !currentLabels.has(desiredLabel)) {
187+ try {
188+ await github.rest.issues.addLabels({
189+ owner, repo, issue_number: pr.number, labels: [desiredLabel],
190+ });
191+ currentLabels.add(desiredLabel);
192+ pr.labels.push({ name: desiredLabel });
193+ } catch (err) {
194+ const error = new Error(`Could not add desired label: ${err.message}`);
195+ error.preserveStateLabels = true;
196+ throw error;
197+ }
198+ }
186199 for (const label of stateLabels) {
187200 if (label !== desiredLabel && currentLabels.has(label)) {
188201 try {
@@ -201,17 +214,6 @@ jobs:
201214 }
202215 }
203216 }
204- if (desiredLabel && !currentLabels.has(desiredLabel)) {
205- try {
206- await github.rest.issues.addLabels({
207- owner, repo, issue_number: pr.number, labels: [desiredLabel],
208- });
209- currentLabels.add(desiredLabel);
210- pr.labels.push({ name: desiredLabel });
211- } catch (err) {
212- labelErrors.push(err);
213- }
214- }
215217 if (desiredLabel !== 'awaiting-author' && currentLabels.has('stale-awaiting-author')) {
216218 try {
217219 await github.rest.issues.removeLabel({
@@ -763,10 +765,12 @@ jobs:
763765 } catch (cleanupError) {
764766 metadataErrors.push(cleanupError);
765767 }
766- try {
767- await reconcileLabels(pr, null);
768- } catch (cleanupError) {
769- metadataErrors.push(cleanupError);
768+ if (!error.preserveStateLabels) {
769+ try {
770+ await reconcileLabels(pr, null);
771+ } catch (cleanupError) {
772+ metadataErrors.push(cleanupError);
773+ }
770774 }
771775 const detail = error.status
772776 ? `${error.message} (HTTP ${error.status}${error.response?.data?.message ? `: ${error.response.data.message}` : ''})`
0 commit comments