Fix naming and beta CI

bidoubiwa · bidoubiwa · commit a3225d5e4be5 · 2022-07-27T16:48:48.000+02:00
diff --git a/.github/workflows/beta-tests.yml b/.github/workflows/beta-tests.yml
@@ -1,38 +1,49 @@
 # Testing the code base against a specific Meilisearch feature
 name: Beta tests
 
-# Will only run for PRs and pushes to *-beta
 on:
-  push:
-    branches: ['!bump-meilisearch-v*.*.*-beta', '**-beta']
   pull_request:
-    branches: ['!bump-meilisearch-v*.*.*-beta', '**-beta']
+  push:
+    # trying and staging branches are for BORS config
+    branches:
+      - trying
+      - staging
+      - main
+
+# TODO: CHANGE
+# Will only run for PRs and pushes to *-beta
+# on:
+#   push:
+#     branches: ['!bump-meilisearch-v*.*.*-beta', '**-beta']
+#   pull_request:
+#     branches: ['!bump-meilisearch-v*.*.*-beta', '**-beta']
 
 jobs:
-  grep-docker-version:
+  meilisearch-version:
     runs-on: ubuntu-latest
     outputs:
-      docker-version: ${{ steps.grep-step.outputs.version }}
+      version: ${{ steps.grep-step.outputs.version }}
     steps:
       - uses: actions/checkout@v3
       - name: Grep docker beta version of Meilisearch
         id: grep-step
         run: |
-          MEILISEARCH_IMAGE=$(sh .github/scripts/beta-docker-version.sh)
-          echo $MEILISEARCH_IMAGE
-          echo ::set-output name=version::$MEILISEARCH_IMAGE
+          MEILISEARCH_VERSION=$(sh .github/scripts/beta-docker-version.sh)
+          echo $MEILISEARCH_VERSION
+          # TODO: CHANGE
+          echo ::set-output name=version::latest
   cypress-run:
     runs-on: ubuntu-latest
-    needs: ['grep-docker-version']
-    # Only test on Google Chrome
+    needs: ['meilisearch-version']
     services:
       meilisearch:
-        image: getmeili/meilisearch:${{ needs.grep-docker-version.outputs.docker-version }}
+        image: getmeili/meilisearch:${{ needs.meilisearch-version.outputs.version }}
         env:
           MEILI_MASTER_KEY: 'masterKey'
           MEILI_NO_ANALYTICS: 'true'
         ports:
           - '7700:7700'
+    name: end-to-end-tests
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -63,12 +74,12 @@ jobs:
           name: cypress-videos
           path: cypress/videos
 
-  tests:
+  integration_tests:
     runs-on: ubuntu-latest
-    needs: ['grep-docker-version']
+    needs: ['meilisearch-version']
     services:
       meilisearch:
-        image: getmeili/meilisearch:${{ needs.grep-docker-version.outputs.docker-version }}
+        image: getmeili/meilisearch:${{ needs.meilisearch-version.outputs.version }}
         env:
           MEILI_MASTER_KEY: 'masterKey'
           MEILI_NO_ANALYTICS: 'true'
@@ -81,18 +92,11 @@ jobs:
     name: integration-tests (Node.js ${{ matrix.node }})
     steps:
       - uses: actions/checkout@v3
-      - name: Cache dependencies
-        uses: actions/cache@v2
-        with:
-          path: |
-            ./node_modules
-          key: ${{ hashFiles('yarn.lock') }}
       - name: Setup node
         uses: actions/setup-node@v3
         with:
-          node-version: '14.x'
-      - name: Meilisearch (${{ needs.grep-docker-version.outputs.docker-version }}) setup with Docker
-        run: docker run -d -p 7700:7700 getmeili/meilisearch:${{ needs.grep-docker-version.outputs.docker-version }} meilisearch --master-key=masterKey --no-analytics
+          cache: yarn
+          node-version: ${{ matrix.node }}
       - name: Install dependencies
         run: yarn install
       - name: Run tests
diff --git a/.github/workflows/pre-release-tests.yml b/.github/workflows/pre-release-tests.yml
@@ -1,16 +1,49 @@
 # Testing the code base against the Meilisearch pre-releases
 name: Pre-Release Tests
 
+# TODO: CHANGE
 # Will only run for PRs and pushes to bump-meilisearch-v*
+# on:
+#   push:
+#     branches: [bump-meilisearch-v*]
+#   pull_request:
+#     branches: [bump-meilisearch-v*]
+
 on:
-  push:
-    branches: [bump-meilisearch-v*]
   pull_request:
-    branches: [bump-meilisearch-v*]
+  push:
+    # trying and staging branches are for BORS config
+    branches:
+      - trying
+      - staging
+      - main
 
 jobs:
+  meilisearch-version:
+    runs-on: ubuntu-latest
+    outputs:
+      version: ${{ steps.grep-step.outputs.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
+          # TODO: CHANGE
+          echo ::set-output name=version::latest
   cypress-run:
     runs-on: ubuntu-latest
+    needs: ['meilisearch-version']
+    services:
+      meilisearch:
+        image: getmeili/meilisearch:${{ needs.meilisearch-version.outputs.version }}
+        env:
+          MEILI_MASTER_KEY: 'masterKey'
+          MEILI_NO_ANALYTICS: 'true'
+        ports:
+          - '7700:7700'
+    name: end-to-end-tests
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -21,16 +54,6 @@ jobs:
           cache: yarn
       - name: Install dependencies
         run: yarn --dev && yarn --cwd ./tests/env/react
-      - name: Grep latest version of Meilisearch
-        run: |
-          echo "MEILISEARCH_LATEST=$(curl https://raw.githubusercontent.com/meilisearch/integration-guides/main/scripts/get-latest-meilisearch-rc.sh | sh)" >> $GITHUB_ENV
-      - name: Download Meilisearch
-        run: |
-          curl https://github.com/meilisearch/meilisearch/releases/download/${{ env.MEILISEARCH_LATEST }}/meilisearch-linux-amd64 --output meilisearch --location
-          chmod +x meilisearch
-      - name: Run Meilisearch
-        run: |
-          ./meilisearch --master-key=masterKey --no-analytics &
       - name: Setup Meilisearch Index
         run: yarn local:env:setup
       - name: Run local browser tests
@@ -51,8 +74,17 @@ jobs:
           name: cypress-videos
           path: cypress/videos
 
-  tests:
+  integration_tests:
     runs-on: ubuntu-latest
+    needs: ['meilisearch-version']
+    services:
+      meilisearch:
+        image: getmeili/meilisearch:${{ needs.meilisearch-version.outputs.version }}
+        env:
+          MEILI_MASTER_KEY: 'masterKey'
+          MEILI_NO_ANALYTICS: 'true'
+        ports:
+          - '7700:7700'
     strategy:
       fail-fast: false
       matrix:
@@ -65,10 +97,6 @@ jobs:
         with:
           cache: yarn
           node-version: ${{ matrix.node }}
-      - name: Get the latest Meilisearch RC
-        run: echo "MEILISEARCH_VERSION=$(curl https://raw.githubusercontent.com/meilisearch/integration-guides/main/scripts/get-latest-meilisearch-rc.sh | bash)" >> $GITHUB_ENV
-      - name: Meilisearch (${{ env.MEILISEARCH_VERSION }}) setup with Docker
-        run: docker run -d -p 7700:7700 getmeili/meilisearch:${{ env.MEILISEARCH_VERSION }} meilisearch --master-key=masterKey --no-analytics
       - name: Install dependencies
         run: yarn install
       - name: Run tests
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -23,6 +23,7 @@ jobs:
           MEILI_NO_ANALYTICS: 'true'
         ports:
           - '7700:7700'
+    name: end-to-end-tests
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -52,7 +53,7 @@ jobs:
         with:
           name: cypress-videos
           path: cypress/videos
-  tests:
+  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')
@@ -83,13 +84,12 @@ jobs:
         run: yarn test
       - name: Build project
         run: yarn build
-  style:
+  style_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')
     name: style-check
     runs-on: ubuntu-latest
-
     steps:
       - uses: actions/checkout@v3
       - name: Setup node
@@ -105,7 +105,7 @@ jobs:
         uses: ibiqlik/action-yamllint@v3
         with:
           config_file: .yamllint.yml
-  types_test:
+  types_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')
