From: Tomas Mraz <tomas@openssl.org>
Date: Mon, 17 May 2021 17:00:13 +0000 (+0200)
Subject: Avoid failing label removal if label is not there
X-Git-Tag: openssl-3.0.0-alpha17~61
X-Git-Url: https://git.openssl.org/gitweb/?a=commitdiff_plain;h=753f1f24ac18e31eb6feaa9bde752f57a7bde9e7;p=openssl.git

Avoid failing label removal if label is not there

Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15309)
---

diff --git a/.github/workflows/fips-label.yml b/.github/workflows/fips-label.yml
index 948ff10b3e..536b227260 100644
--- a/.github/workflows/fips-label.yml
+++ b/.github/workflows/fips-label.yml
@@ -19,7 +19,7 @@ jobs:
             var artifacts = await github.actions.listWorkflowRunArtifacts({
               owner: context.repo.owner,
               repo: context.repo.repo,
-              run_id: ${{github.event.workflow_run.id }},
+              run_id: ${{ github.event.workflow_run.id }},
             });
             if ( artifacts.data.artifacts[0].name == 'fips_changed' ) {
               github.issues.addLabels({
@@ -29,10 +29,20 @@ jobs:
                 labels: ['severity: fips change']
               });
             } else if ( artifacts.data.artifacts[0].name == 'fips_unchanged' ) {
-              github.issues.removeLabel({
+              var labels = await github.issues.listLabelsOnIssue({
                 issue_number: ${{ github.event.workflow_run.pull_requests[0].number }},
                 owner: context.repo.owner,
                 repo: context.repo.repo,
-                name: 'severity: fips change'
               });
+
+              for ( var label in labels.data ) {
+                if (labels.data[label].name == 'severity: fips change') {
+                  github.issues.removeLabel({
+                    issue_number: ${{ github.event.workflow_run.pull_requests[0].number }},
+                    owner: context.repo.owner,
+                    repo: context.repo.repo,
+                    name: 'severity: fips change'
+                  });
+                }
+              }
             }