Merge branch 'master' of github.com:HiFiPhile/tinyusb into vendor_fifo

2 files changed, 21 insertions, 18 deletions

diff --git a/.github/workflows/build_iar.yml b/.github/workflows/build_iar.yml
index a0a022ecc..499349904 100644
--- a/.github/workflows/build_iar.yml
+++ b/.github/workflows/build_iar.yml
@@ -28,6 +28,7 @@ concurrency:
 
 jobs:
   cmake:
+    if: github.repository_owner == 'hathach'
     runs-on: [self-hosted, Linux, X64, hifiphile]
     strategy:
       fail-fast: false
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
index 4733c6f06..947b08ca2 100644
--- a/.github/workflows/labeler.yml
+++ b/.github/workflows/labeler.yml
@@ -28,29 +28,31 @@ jobs:
               issueOrPrNumber = context.payload.pull_request.number;
             }
 
-            // Check for Adafruit membership
-            const adafruitResponse = await github.rest.orgs.checkMembershipForUser({
-              org: 'adafruit',
-              username: username
-            });
-
-            if (adafruitResponse.status === 204) {
-              console.log('Adafruit Member');
-              label = 'Prio Urgent';
-            } else {
-              // Check if the user is a contributor
-              const collaboratorResponse = await github.rest.repos.checkCollaborator({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
+            try {
+              // Check for Adafruit membership
+              const adafruitResponse = await github.rest.orgs.checkMembershipForUser({
+                org: 'adafruit',
                 username: username
               });
 
-              if (collaboratorResponse.status === 204) {
-                console.log('Contributor');
-                label = 'Prio Higher';
+              if (adafruitResponse.status === 204) {
+                console.log('Adafruit Member');
+                label = 'Prio Urgent';
               } else {
-                console.log('Not a contributor or Adafruit member');
+                // If not a Adafruit member, check if the user is a contributor
+                const collaboratorResponse = await github.rest.repos.checkCollaborator({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  username: username
+                });
+
+                if (collaboratorResponse.status === 204) {
+                  console.log('Contributor');
+                  label = 'Prio Higher';
+                }
               }
+            } catch (error) {
+              console.log(`Error processing user ${username}: ${error.message}`);
             }
 
             if (label !== '') {