ci: update global workflows

asyncapi · Aug 10, 2021 · 576e7dd · 576e7dd
1 parent ba77b5e
commit 576e7dd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/automerge-orphans.yml b/.github/workflows/automerge-orphans.yml
@@ -38,7 +38,13 @@ jobs:
             };
             const { repository: { pullRequests: { nodes } } } = await github.graphql(query, variables);
 
-            let orphans = nodes.filter((pr)=> pr.state === 'OPEN' && (pr.author.resourcePath === '/asyncapi-bot' || pr.author.resourcePath === '/apps/dependabot'))
+            let orphans = nodes.filter((pr)=> {
+              console.log('PR', pr.url);
+              console.log('State', pr.state);
+              console.log('Author resource path', pr.author.resourcePath);
+              console.log('Is orphan', pr.state === 'OPEN' && (pr.author.resourcePath === '/asyncapi-bot' || pr.author.resourcePath === '/apps/dependabot'));
+              return pr.state === 'OPEN' && (pr.author.resourcePath === '/asyncapi-bot' || pr.author.resourcePath === '/apps/dependabot')
+            })
 
             if (orphans.length) {
               core.setOutput('found', 'true');

diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
@@ -26,7 +26,7 @@ jobs:
     steps:
       - name: Autoapproving
         uses: hmarr/auto-approve-action@v2
-        if: github.actor == 'asyncapi-bot' || github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
+        if: github.actor == ('asyncapi-bot' || github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]') && !contains(github.event.pull_request.labels.*.name, 'released')
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
 
@@ -44,4 +44,4 @@ jobs:
           MERGE_METHOD: "squash"
           MERGE_COMMIT_MESSAGE: "pull-request-title"
           MERGE_RETRIES: "20"
-          MERGE_RETRY_SLEEP: "20000"
+          MERGE_RETRY_SLEEP: "30000"