Merge pull request #5995 from wileyj/fix/5989

Resolves issues 5991 and 5989

Author: wileyj

.github/workflows/clippy.yml

@@ -7,6 +7,9 @@ name: Clippy Checks
 # Only run when:
 #   - PRs are (re)opened against develop branch
 on:
+  merge_group:
+    types:
+      - checks_requested
   pull_request:
     branches:
       - develop
@@ -34,4 +37,4 @@ jobs:
           components: clippy
       - name: Clippy
         id: clippy
-        run: cargo clippy-stacks
+        run: cargo clippy-stacks

.github/workflows/github-release.yml

@@ -164,8 +164,11 @@ jobs:
   ## Create the downstream PR for the release branch to master,develop
   create-pr:
     if: |
-      inputs.node_tag != '' ||
-      inputs.signer_tag != ''
+      !contains(github.ref, '-rc') &&
+      (
+        inputs.node_tag != '' ||
+        inputs.signer_tag != ''
+      )
     name: Create Downstream PR (${{ github.ref_name }})
     runs-on: ubuntu-latest
     needs: