Added pull-request workflows

- pull-request.yml workflow for PR for unstable and release branches
- renamed custom_build to custom_ref_type
- renamed pre-merge to build-n-test
- removed nightly test workflow

Author: dariaguy

.github/actions/build-and-tag-locally/action.yml

@@ -35,11 +35,11 @@ inputs:
   redistimeseries_version:
     description: 'Redistimeseries version to build'
     required: false
-  custom_build:
+  custom_ref_type:
     description: 'Type of custom release, branch tag or commit. Empty for release'
     required: false
   run_type:
-    description: 'Run type, either release, nightly, unstable or custom'
+    description: 'Run type, either release, pr, nightly, unstable or custom'
     required: true
 
 runs:
@@ -108,13 +108,13 @@ runs:
 
     - name: Redis release archive
       shell: bash
-      if: inputs.run_type != 'release'
+      if: inputs.run_type != 'release' && inputs.run_type != 'pr'
       run: |
-        if [[ "${{ inputs.custom_build }}" == "branch" ]]; then
+        if [[ "${{ inputs.custom_ref_type }}" == "branch" ]]; then
             echo "REDIS_DOWNLOAD_URL=https://github.com/redis/redis/archive/refs/heads/${{ inputs.release_tag }}.tar.gz" | tee -a "$GITHUB_ENV"
-        elif [[ "${{ inputs.custom_build }}" == "tag" ]]; then
+        elif [[ "${{ inputs.custom_ref_type }}" == "tag" ]]; then
             echo "REDIS_DOWNLOAD_URL=https://github.com/redis/redis/archive/refs/tags/${{ inputs.release_tag }}.tar.gz" | tee -a "$GITHUB_ENV"
-        elif [[ "${{ inputs.custom_build }}" == "commit" ]]; then
+        elif [[ "${{ inputs.custom_ref_type }}" == "commit" ]]; then
             echo "REDIS_DOWNLOAD_URL=https://github.com/redis/redis/archive/${{ inputs.release_tag }}.tar.gz" | tee -a "$GITHUB_ENV"
         else
             echo "Wrong custom_build type, available options are tag, branch and commit"
@@ -137,8 +137,8 @@ runs:
           REDISJSON_VERSION=${{ inputs.redisjson_version }}
           REDISBLOOM_VERSION=${{ inputs.redisbloom_version }}
           REDISTIMESERIES_VERSION=${{ inputs.redistimeseries_version }}
-          ${{ inputs.run_type != 'release' && 'CUSTOM_BUILD=true' || '' }}
-          ${{ inputs.run_type != 'release' && format('REDIS_DOWNLOAD_URL={0}', env.REDIS_DOWNLOAD_URL) || '' }}
+          ${{ (inputs.run_type != 'release' && inputs.run_type != 'pr') && 'CUSTOM_BUILD=true' || '' }}
+          ${{ (inputs.run_type != 'release' && inputs.run_type != 'pr') && format('REDIS_DOWNLOAD_URL={0}', env.REDIS_DOWNLOAD_URL) || '' }}
 
     - name: Capture build logs on failure
       shell: bash

.github/workflows/pre-merge.yml .github/workflows/build-n-test.yml.github/workflows/pre-merge.yml renamed to .github/workflows/build-n-test.yml

@@ -1,10 +1,6 @@
 
 name: Build and Test
 on:
-  pull_request:
-    branches:
-      - master
-      - release/*
   workflow_call:
     inputs:
       release_tag:
@@ -32,12 +28,12 @@ on:
         required: false
         type: boolean
         default: false
-      custom_build:
+      custom_ref_type:
         description: 'Custom type, either branch, tag or commit. Empty for releases'
         required: false
         type: string
       run_type:
-        description: 'Run type, either release, unstable, nightly or custom'
+        description: 'Run type, either release, pr, unstable, nightly or custom'
         required: false
         type: string
     outputs:
@@ -92,20 +88,20 @@ jobs:
           platform: ${{ matrix.platform }}
           registry_username: ${{ github.actor }}
           registry_password: ${{ secrets.GITHUB_TOKEN }}
-          publish_image: ${{ inputs.publish_image || vars.PUBLISH_IMAGE }}
+          publish_image: ${{ inputs.publish_image }}
           registry_repository: ${{ format('ghcr.io/{0}', github.repository) }}
           release_tag: ${{ inputs.release_tag }}
           redisearch_version: ${{ inputs.redisearch_version }}
           redisjson_version: ${{ inputs.redisjson_version }}
           redisbloom_version: ${{ inputs.redisbloom_version }}
           redistimeseries_version: ${{ inputs.redistimeseries_version }}
-          custom_build: ${{ inputs.custom_build }}
+          custom_ref_type: ${{ inputs.custom_ref_type }}
           run_type: ${{ inputs.run_type }}
 
   collect-images-metadata:
     runs-on: ubuntu-latest
     needs: build-and-test
-    if: ${{ inputs.release_tag }}
+    if: ${{ inputs.release_tag && inputs.run_type == 'release' }}
     outputs:
       docker_images_metadata: ${{ steps.collect-metadata.outputs.metadata }}
     steps:

.github/workflows/pull-request.yml

@@ -0,0 +1,32 @@
+name: Pull Request Build and Test
+
+on:
+  pull_request:
+    branches:
+      - master
+      - release/*
+      - unstable
+
+jobs:
+  build-and-test:
+    uses: ./.github/workflows/build-n-test.yml
+    if: github.event_name == 'pull_request' && github.base_ref != 'unstable'
+    secrets: inherit
+    with:
+      release_tag: ''
+      publish_image: false
+      run_type: pr
+
+  build-and-test-unstable:
+    uses: ./.github/workflows/build-n-test.yml
+    if: github.event_name == 'pull_request' && github.base_ref == 'unstable'
+    secrets: inherit
+    with:
+      release_tag: unstable
+      publish_image: false
+      redisearch_version: master
+      redisjson_version: master
+      redisbloom_version: master
+      redistimeseries_version: master
+      custom_ref_type: branch
+      run_type: unstable

.github/workflows/release_build_and_test.yml

@@ -26,7 +26,7 @@ on:
       redistimeseries_version:
         description: 'Redistimeseries version to build'
         required: false
-      custom_build:
+      custom_ref_type:
         description: 'Custom type, either branch, tag or commit. Empty for releases'
         required: false
       run_type:
@@ -73,7 +73,7 @@ jobs:
           release_version_branch: ${{ steps.ensure-branch.outputs.release_version_branch }}
 
   build-and-test:
-    uses: ./.github/workflows/pre-merge.yml
+    uses: ./.github/workflows/build-n-test.yml
     needs: prepare-release
     if: always() && (needs.prepare-release.result == 'success' || needs.prepare-release.result == 'skipped')
     secrets: inherit
@@ -84,22 +84,19 @@ jobs:
       redisjson_version: ${{ github.event.inputs.redisjson_version }}
       redisbloom_version: ${{ github.event.inputs.redisbloom_version }}
       redistimeseries_version: ${{ github.event.inputs.redistimeseries_version }}
-      custom_build: ${{ github.event.inputs.custom_build }}
+      custom_ref_type: ${{ github.event.inputs.custom_ref_type }}
       run_type: ${{ github.event.inputs.run_type }}
 
   merge-back-to-release-branch:
     needs: [prepare-release, build-and-test]
-    if: success()
+    if: success() && github.event.inputs.run_type == 'release' && github.event.inputs.release_tag != 'unstable'
     runs-on: ["ubuntu-latest"]
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.inputs.release_tag == 'unstable' && 'unstable' || '' }}
 
       - name: Ensure Release Branch
         id: ensure-branch
-        if: github.event.inputs.release_tag != 'unstable'
         uses: redis-developer/redis-oss-release-automation/.github/actions/ensure-release-branch@main
         with:
           release_tag: ${{ github.event.inputs.release_tag }}
@@ -108,7 +105,6 @@ jobs:
 
       - name: Merge back to release branch
         id: merge-back
-        if: github.event.inputs.release_tag != 'unstable'
         uses: redis-developer/redis-oss-release-automation/.github/actions/merge-branches-verified@main
         with:
           from_branch: ${{ steps.ensure-branch.outputs.release_version_branch }}