Set pipeline to run on PRs and changes to stage and master

aerospike · Dec 5, 2024 · eeeae7e · eeeae7e
1 parent 3a09953
commit eeeae7e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/.github/actions/run-ee-server/action.yml b/.github/actions/run-ee-server/action.yml
@@ -5,7 +5,7 @@ description: 'Run EE server. Returns once server is ready. Only tested on Linux
 inputs:
   # All inputs in composite actions are strings
   use-server-rc:
-    required: false
+    required: true
     description: Deploy server release candidate?
     default: 'false'
   server-tag:

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -1,12 +1,13 @@
 name: Run tests
 
 # Trigger test workflow whenever:
-# 1. Commits are pushed directly to the mrt branch
+# 1. A pull request is updated (e.g with new commits)
+# 2. Commits are pushed directly to the stage or master branch
 on:
   push:
-    branches: ["mrt"]
+    branches: ["stage*", "master*"]
   pull_request:
-    branches: ["mrt"]
+    branches: ["stage*", "master*"]
     types: [
       # Default triggers
       opened,
@@ -32,7 +33,7 @@ jobs:
 
     - uses: ./.github/actions/run-ee-server
       with:
-        use-server-rc: false
+        use-server-rc: use-server-rc: ${{ contains(github.event.pull_request.labels.*.name, 'new-server-features') }}
         docker-hub-username: ${{ secrets.DOCKER_HUB_BOT_USERNAME }}
         docker-hub-password: ${{ secrets.DOCKER_HUB_BOT_PW }}