Merge #1447

1447: Improve beta release process r=bidoubiwa a=bidoubiwa

Based on this: https://github.com/meilisearch/instant-meilisearch/pull/898/files

It introduces consistency in the beta naming branches and ensures that the release works as expected.

Co-authored-by: Charlotte Vermandel <[email protected]>

Author: meili-bors[bot]

.github/scripts/beta-docker-version.sh

@@ -1,9 +1,19 @@
 #!/bin/sh
 
-package_json_version=$(grep '"version":' package.json | cut -d ':' -f 2- | tr -d ' ' | tr -d '"' | tr -d ',')
-beta_feature=$(echo $package_json_version | sed -r 's/[0-9]+.[0-9]+.[0-9]+-//')
-beta_feature=$(echo $beta_feature | sed -r 's/-beta\.[0-9]*$//')
+# This script is ran whenever a PR is made to implement a Meilisearch prototype.
+# For example if Meilisearch creates a prototype for radioactive search, the SDK may implement a way to try out the radioactive search.
+# Nonetheless, the tests of this implentation should run against the prototype and not the latest release of Meilisearch.
+# To be able to do so, Meilisearch creates a docker image with the changes.
+# The purpose of this script is to find the correct docker image containing the changes.
+# For example,
+# The radioactive search docker image is named `prototype-radioactive-search-0`
+# our branch is named `prototype-beta/prototype-radioactive-search`
+# Using the branch name, this script is going to retrieve the name of the docker image.
 
-docker_image=$(curl https://hub.docker.com/v2/repositories/getmeili/meilisearch/tags | jq | grep "$beta_feature" | head -1)
+# See https://docs.github.com/en/actions/learn-github-actions/environment-variables#default-environment-variables for references on GITHUB_REF_NAME
+prototype_branch=$1                                                        # $GITHUB_REF_NAME
+prototype_branch=$(echo $prototype_branch | sed -r 's/prototype-beta\///') # remove pre-prending prototype-beta/
+
+docker_image=$(curl "https://hub.docker.com/v2/repositories/getmeili/meilisearch/tags?&page_size=100" | jq | grep "$prototype_name" | head -1)
 docker_image=$(echo $docker_image | grep '"name":' | cut -d ':' -f 2- | tr -d ' ' | tr -d '"' | tr -d ',')
 echo $docker_image

.github/scripts/check-tag-format.sh

@@ -5,26 +5,24 @@ is_pre_release=$1
 current_tag=$(echo $GITHUB_REF | cut -d '/' -f 3 | tr -d ' ',v)
 
 if [ $is_pre_release = false ]; then
-  # Works with the format vX.X.X
+  # Works with the format vX.X.X, X being numbers
   #
   # Example of correct format:
   # v0.1.0
-  echo "$current_tag" | grep -E "[0-9]*\.[0-9]*\.[0-9]*$"
+  echo "$current_tag" | grep -E "^[0-9]+\.[0-9]+\.[0-9]+$"
   if [ $? != 0 ]; then
     echo "Error: Your tag: $current_tag is wrongly formatted."
     echo 'Please refer to the contributing guide for help.'
     exit 1
   fi
   exit 0
 elif [ $is_pre_release = true ]; then
-  # Works with the format vX.X.X-xxx-beta.X
-  # none or multiple -xxx are valid
+  # Works with the format vX.X.X-**.X, X being numbers
   #
   # Examples of correct format:
-  # v0.1.0-beta.0
-  # v0.1.0-xxx-beta.0
-  # v0.1.0-xxx-xxx-beta.0
-  echo "$current_tag" | grep -E "[0-9]*\.[0-9]*\.[0-9]*-([a-z]*-)*beta\.[0-9]*$"
+  # 0.2.0-pagination.1
+  # 0.2.0-v0.30.0-pre-release.0
+  echo "$current_tag" | grep -E "^[0-9]+\.[0-9]+\.[0-9]+-.*\.[0-9]*$"
 
   if [ $? != 0 ]; then
     echo "Error: Your beta tag: $current_tag is wrongly formatted."

.github/workflows/beta-tests.yml renamed to .github/workflows/meilisearch-prototype-tests.yml

@@ -1,26 +1,34 @@
 # Testing the code base against a specific Meilisearch feature
-name: Beta tests
+name: Meilisearch prototype tests
 
-# Will only run for PRs and pushes to *-beta and not the bump betas
+# Will only run for PRs and pushes to *-beta
 on:
-  push:
-    branches: ['**-beta', '!bump-meilisearch-v[0-9]*.[0-9]*.[0-9]*-beta']
   pull_request:
-    branches: ['**-beta', '!bump-meilisearch-v[0-9]*.[0-9]*.[0-9]*-beta']
+    branches:
+      - 'prototype-beta/**'
+  push:
+    branches:
+      - 'prototype-beta/**'
 
 jobs:
   meilisearch-version:
     runs-on: ubuntu-latest
     outputs:
-      version: ${{ steps.grep-step.outputs.version }}
+      version: ${{ steps.grep-step.outputs.meilisearch_version }}
     steps:
       - uses: actions/checkout@v3
       - name: Grep docker beta version of Meilisearch
         id: grep-step
         run: |
-          MEILISEARCH_VERSION=$(sh .github/scripts/beta-docker-version.sh)
-          echo $MEILISEARCH_VERSION
-          echo ::set-output name=version::$MEILISEARCH_VERSION
+          MEILISEARCH_VERSION=$(sh .github/scripts/prototype-docker-version.sh $GITHUB_REF_NAME)
+          if [ -z "$MEILISEARCH_VERSION" ]
+          then
+            echo "Could not find any docker image for this prototype: $GITHUB_REF_NAME"
+            exit 1
+          else
+            echo $MEILISEARCH_VERSION
+          fi
+          echo "meilisearch_version=$MEILISEARCH_VERSION" >> $GITHUB_OUTPUT
   integration_tests:
     runs-on: ubuntu-latest
     needs: ['meilisearch-version']

.github/workflows/pre-release-tests.yml

@@ -1,28 +1,33 @@
 # Testing the code base against the Meilisearch pre-releases
 name: Pre-Release Tests
 
-# # Will only run for PRs and pushes to bump-meilisearch-v*
+# Will only run for PRs and pushes to bump-meilisearch-v*
 on:
-  push:
-    branches: [bump-meilisearch-v*]
   pull_request:
-    branches: [bump-meilisearch-v*]
+    branches:
+      - 'bump-meilisearch-v**'
+      - 'pre-release-beta/**'
+  push:
+    branches:
+      - 'bump-meilisearch-v**'
+      - 'pre-release-beta/**'
 
 jobs:
   meilisearch-version:
     runs-on: ubuntu-latest
+    if: github.event_name != 'pull_request' || !startsWith(github.base_ref, 'bump-meilisearch-v')
     outputs:
-      version: ${{ steps.grep-step.outputs.version }}
+      version: ${{ steps.grep-step.outputs.meilisearch_version }}
     steps:
       - uses: actions/checkout@v3
       - name: Grep docker beta version of Meilisearch
         id: grep-step
         run: |
           MEILISEARCH_VERSION=$(curl https://raw.githubusercontent.com/meilisearch/integration-guides/main/scripts/get-latest-meilisearch-rc.sh | sh)
-          echo $MEILISEARCH_VERSION
-          echo ::set-output name=version::$MEILISEARCH_VERSION
+          echo "meilisearch_version=$MEILISEARCH_VERSION" >> $GITHUB_OUTPUT
   integration_tests:
     runs-on: ubuntu-latest
+    if: github.event_name != 'pull_request' || !startsWith(github.base_ref, 'bump-meilisearch-v')
     needs: ['meilisearch-version']
     services:
       meilisearch:

.github/workflows/publish.yml

@@ -22,12 +22,12 @@ jobs:
       - name: Build meilisearch-js
         run: yarn build
       - name: Publish with latest tag
-        if: "!github.event.release.prerelease && !contains(github.ref, 'beta')"
+        if: '!github.event.release.prerelease'
         run: npm publish .
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
       - name: Publish with beta tag
-        if: "github.event.release.prerelease && contains(github.ref, 'beta')"
+        if: 'github.event.release.prerelease'
         run: npm publish . --tag beta
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}

.github/workflows/tests.yml

@@ -12,8 +12,16 @@ on:
 jobs:
   integration_tests:
     # Will not run if the event is a PR to bump-meilisearch-v* (so a pre-release PR)
-    # Will still run for each push to bump-meilisearch-v*
-    if: github.event_name != 'pull_request' || !startsWith(github.base_ref, 'bump-meilisearch-v')
+    # Will not run if the event is a PR to pre-release-beta/*
+    # Will not run if the event is a PR to prototype-beta/*
+    # Will not run if the event is a push on pre-release-beta/*
+    # Will still run for each push to bump-meilisearch-v* and prototype-beta/*
+    if: |
+      github.event_name != 'pull_request' ||
+      !startsWith(github.base_ref, 'bump-meilisearch-v') &&
+      !startsWith(github.base_ref, 'pre-release-beta/') &&
+      !startsWith(github.base_ref, 'prototype-beta/') &&
+      !startsWith(github.head_ref, 'pre-release-beta/')
     runs-on: ubuntu-latest
     services:
       meilisearch:

CONTRIBUTING.md

@@ -115,6 +115,8 @@ _[Read more about this](https://github.com/meilisearch/integration-guides/blob/m
 
 ⚠️ Before doing anything, make sure you got through the guide about [Releasing an Integration](https://github.com/meilisearch/integration-guides/blob/main/resources/integration-release.md).
 
+#### Version update
+
 Make a PR modifying the following files with the right version:
 
 [`package.json`](/package.json):
@@ -127,49 +129,48 @@ Make a PR modifying the following files with the right version:
 export const PACKAGE_VERSION = 'X.X.X'
 ```
 
+#### Github publish
+
 Once the changes are merged on `main`, you can publish the current draft release via the [GitHub interface](https://github.com/meilisearch/meilisearch-js/releases): on this page, click on `Edit` (related to the draft release) > update the description (be sure you apply [these recommendations](https://github.com/meilisearch/integration-guides/blob/main/resources/integration-release.md#writting-the-release-description)) > when you are ready, click on `Publish release`.
 
 GitHub Actions will be triggered and push the package to [npm](https://www.npmjs.com/package/meilisearch).
 
 #### Release a `beta` Version
 
-Here are the steps to release a beta version of this package:
+This package is able to create multiple types of betas:
+- A standard package beta, working on the latest version of Meilisearch.
+- A beta implementing the changes of a rc version of Meilisearch.
+- A beta implementing a specific feature `prototype` of Meilisearch.
+
+Here are the steps to release a beta version of this package depending on its type:
 
-- Create a new branch containing the "beta" changes with the following format `xxx-beta` where `xxx` explains the context.
+1. Create a new branch containing the changes with the correct name format following these rules:
+    - `package beta`: create a branch `beta/xx-xx` with the context of your beta.
+      Example: `beta/refactor`.
+    - Meilisearch `pre-release beta`: create a branch originating from `bump-meilisearch-v*.*.*` named `pre-release-beta/v*.*.*`. <br>
+      Example: `pre-release-beta/v0.30.0`
+    - Meilisearch `prototype beta`: create a branch `prototype-beta/xx-xx`. Where `xxx` has the same name as the docker image containing the prototype.
+        Example: If the [docker image](https://hub.docker.com/r/getmeili/meilisearch/tags) is named: `prototype-multi-search-0`, the branch should be named: `prototype-beta/prototype-multi-search`
 
-  For example:
-    - When implementing a beta feature, create a branch `my-feature-beta` where you implement the feature.
-      ```bash
-        git checkout -b my-feature-beta
-      ```
-    - During the Meilisearch pre-release, create a branch originating from `bump-meilisearch-v*.*.*` named `bump-meilisearch-v*.*.*-beta`. <br>
-    `v*.*.*` is the next version of the package, NOT the version of Meilisearch!
+2. [Update the version](#version-update) following the correct format (X are numbers):
+    - package and prototype beta: `X.X.X-***.X`
+      example: `0.2.0-new-feature.0`
+    - pre-release beta: `X.X.X-vX.X.X-pre-release.X`
+      example: `0.2.0-v0.30.0-pre-release.0`
 
-      ```bash
-      git checkout bump-meilisearch-v*.*.*
-      git pull origin bump-meilisearch-v*.*.*
-      git checkout -b bump-meilisearch-v*.*.*-beta
-      ```
+3. Commit and push your code to the newly created branch (step 1).
 
-- Change the version in [`package.json`](/package.json) and in [`src/package-version`](/src/package-version.ts) with `*.*.*-xxx-beta.0` and commit it to the `beta` branch.
 
-- Go to the [GitHub interface for releasing](https://github.com/meilisearch/meilisearch-js/releases): on this page, click on `Draft a new release`.
+4. Go to the [GitHub interface for releasing](https://github.com/meilisearch/meilisearch-js/releases): on this page, click on `Draft a new release`.
 
-- Create a GitHub pre-release:
+5. Create a GitHub pre-release:
   - Fill the description with the detailed changelogs
   - Fill the title with `vX.X.X-beta.0`
   - Fill the tag with `vX.X.X-beta.0`
   - ⚠️ Select the `vX.X.X-beta.0` branch and NOT `main`
   - ⚠️ Click on the "This is a pre-release" checkbox
   - Click on "Publish release"
 
-GitHub Actions will be triggered and push the beta version to [npm](https://www.npmjs.com/package/meilisearch).
-
-💡 If you need to release a new beta for the same version (i.e. `vX.X.X-beta.1`):
-- merge the change into your beta branch
-- change the version name in [`package.json`](/package.json) and in [`src/package-version`](/src/package-version.ts)
-- creata a pre-release via the GitHub interface
-
 <hr>
 
 Thank you again for reading this through. We can not wait to begin to work with you if you make your way through this contributing guide ❤️