ci: clean up naming

Author: Brynley Llewellyn-Roux

.github/workflows/ci.yml .github/workflows/merge.yml.github/workflows/ci.yml renamed to .github/workflows/merge.yml

@@ -1,4 +1,4 @@
-name: CI
+name: CI / Merge
 
 on:
   push:
@@ -117,10 +117,10 @@ jobs:
       group: integration-merge
       cancel-in-progress: true
     needs:
-      - build-pull
       - check-lint
       - check-build
       - check-test
+      - build-pull
     if: github.ref == 'refs/heads/staging'
     steps:
       - uses: actions/checkout@v4

.github/workflows/release.yml

@@ -1,4 +1,4 @@
-name: Release
+name: CI / Release
 
 on:
   push:
@@ -97,9 +97,7 @@ jobs:
       - check-lint
       - check-build
       - check-test
-    if: >
-      startsWith(github.ref, 'refs/tags/v') &&
-      contains(github.ref, '-')
+    if: contains(github.ref, '-')
     steps:
       - uses: actions/checkout@v4
       - name: Run deployment
@@ -123,7 +121,6 @@ jobs:
       - check-build
       - check-test
     if: >
-      startsWith(github.ref, 'refs/tags/v') &&
       !contains(github.ref, '-')
     steps:
       - uses: actions/checkout@v4