fixes & test

nodejs · Nov 10, 2022 · 7160ddc · 7160ddc
1 parent f4a4f17
commit 7160ddc
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/.github/workflows/commit-queue.yml b/.github/workflows/commit-queue.yml
@@ -32,13 +32,13 @@ jobs:
     steps:
       - name: Get Pull Requests
         id: get_mergeable_prs
-        run: >
+        run: |
           prs=$(gh pr list \
                   --repo ${{ github.repository }} \
                   --base ${{ github.ref_name }} \
                   --label 'commit-queue' \
                   --json 'number' \
-                  --search "created:<=$(date --date="2 days ago"  +"%Y-%m-%dT%H:%M:%S%z")"
+                  --search "created:<=$(date --date="2 days ago"  +"%Y-%m-%dT%H:%M:%S%z")" \
                   -t '{{ range . }}{{ .number }} {{ end }}' \
                   --limit 100)
           fast_track_prs=$(gh pr list \
@@ -47,10 +47,9 @@ jobs:
                   --label 'commit-queue' \
                   --label 'fast-track' \
                   --json 'number' \
-                  --search "created:<=$(date --date="2 days ago"  +"%Y-%m-%dT%H:%M:%S%z")"
                   -t '{{ range . }}{{ .number }} {{ end }}' \
                   --limit 100)
-          numbers=echo $prs'\n'$fast_track_prs | jq -s 'add'
+          numbers=$(echo $prs' '$fast_track_prs | jq -r -s 'unique | join(" ")')
           echo "numbers=$numbers" >> $GITHUB_OUTPUT
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}