Merge branch 'master' into bot/update-files-from-global-repo

asyncapi · Dec 2, 2024 · 8604b9d · 8604b9d
2 parents ab1bd36 + 19cfcd2
commit 8604b9d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 47 deletions.
diff --git a/.github/workflows/bounty-program-commands.yml b/.github/workflows/bounty-program-commands.yml
@@ -14,18 +14,12 @@ on:
     types:
       - created
 
-env:
-  BOUNTY_PROGRAM_LABELS_JSON: |
-    [
-      {"name": "bounty", "color": "0e8a16", "description": "Participation in the Bounty Program"}
-    ]
-
 jobs:
   guard-against-unauthorized-use:
     if: >
       github.actor != ('aeworxet' || 'thulieblack') &&
       (
-        startsWith(github.event.comment.body, '/bounty' )
+        contains(github.event.comment.body, '/bounty' )
       )
 
     runs-on: ubuntu-latest
@@ -52,10 +46,15 @@ jobs:
     if: >
       github.actor == ('aeworxet' || 'thulieblack') &&
       (
-        startsWith(github.event.comment.body, '/bounty' )
+        contains(github.event.comment.body, '/bounty' )
       )
 
     runs-on: ubuntu-latest
+    env:
+      BOUNTY_PROGRAM_LABELS_JSON: |
+        [
+          {"name": "bounty", "color": "0e8a16", "description": "Participation in the Bounty Program"}
+        ]
 
     steps:
       - name: Add label `bounty`
@@ -89,38 +88,3 @@ jobs:
               repo: context.repo.repo,
               labels: [BOUNTY_PROGRAM_LABELS[0].name]
             })
-
-  remove-label-bounty:
-    if: >
-      github.actor == ('aeworxet' || 'thulieblack') &&
-      (
-        startsWith(github.event.comment.body, '/unbounty' )
-      )
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Remove label `bounty`
-        uses: actions/github-script@v6
-
-        with:
-          github-token: ${{ secrets.GH_TOKEN }}
-          script: |
-            const BOUNTY_PROGRAM_LABELS = JSON.parse(process.env.BOUNTY_PROGRAM_LABELS_JSON);
-            let LIST_OF_LABELS_FOR_ISSUE = await github.rest.issues.listLabelsOnIssue({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: context.issue.number,
-                });
-
-            LIST_OF_LABELS_FOR_ISSUE = LIST_OF_LABELS_FOR_ISSUE.data.map(key => key.name);
-
-            if (LIST_OF_LABELS_FOR_ISSUE.includes(BOUNTY_PROGRAM_LABELS[0].name)) {
-              console.log('Removing label `bounty`...');
-              github.rest.issues.removeLabel({
-                issue_number: context.issue.number,
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                name: [BOUNTY_PROGRAM_LABELS[0].name]
-              })
-            }
diff --git a/.github/workflows/help-command.yml b/.github/workflows/help-command.yml
@@ -31,11 +31,9 @@ jobs:
         
                     At the moment the following comments are supported in pull requests:
 
-                    - \`/please-take-a-look\` or \`/ptal\` - This comment will add a comment to the PR asking for attention from the reviewrs who have not reviewed the PR yet.
                     - \`/ready-to-merge\` or \`/rtm\` - This comment will trigger automerge of PR in case all required checks are green, approvals in place and do-not-merge label is not added
                     - \`/do-not-merge\` or \`/dnm\` - This comment will block automerging even if all conditions are met and ready-to-merge label is added
-                    - \`/autoupdate\` or \`/au\` - This comment will add \`autoupdate\` label to the PR and keeps your PR up-to-date to the target branch's future changes. Unless there is a merge conflict or it is a draft PR. (Currently only works for upstream branches.)
-                    - \`/update\` or \`/u\` - This comment will update the PR with the latest changes from the target branch. Unless there is a merge conflict or it is a draft PR. NOTE: this only updates the PR once, so if you need to update again, you need to call the command again.`
+                    - \`/autoupdate\` or \`/au\` - This comment will add \`autoupdate\` label to the PR and keeps your PR up-to-date to the target branch's future changes. Unless there is a merge conflict or it is a draft PR.`
             })
 
   create_help_comment_issue:

diff --git a/.github/workflows/if-nodejs-pr-testing.yml b/.github/workflows/if-nodejs-pr-testing.yml
@@ -66,8 +66,14 @@ jobs:
         run: npm install -g npm@8.19.4
       - if: steps.packagejson.outputs.exists == 'true'
         name: Install dependencies
-        shell: bash
+        id: first-installation
         run: npm ci
+        continue-on-error: true
+      - if: steps.first-installation.outputs.status == 'failure' && steps.packagejson.outputs.exists == 'true'
+        name: Clear NPM cache and install deps again
+        run: | 
+          npm cache clean --force
+          npm ci
       - if: steps.packagejson.outputs.exists == 'true'
         name: Test
         run: npm test --if-present