From 793fc3beaa26f97dea8c07e49cf5bb76dec2e459 Mon Sep 17 00:00:00 2001 From: Strift Date: Thu, 18 Sep 2025 16:41:43 +0800 Subject: [PATCH 1/6] Add trigger on merge queue --- .github/workflows/tests.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f8d46779..cc81a438 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -2,13 +2,10 @@ name: Tests on: pull_request: + merge_group: push: - # trying and staging branches are for BORS config branches: - - trying - - staging - main - - feature/** - v1.x jobs: From 663e7ecac2b8c06e669a32bf8786b072c21cfbce Mon Sep 17 00:00:00 2001 From: Strift Date: Wed, 24 Sep 2025 13:17:40 +0800 Subject: [PATCH 2/6] Remove bors.toml and update contributing guide --- CONTRIBUTING.md | 17 +++++++++-------- bors.toml | 39 --------------------------------------- 2 files changed, 9 insertions(+), 47 deletions(-) delete mode 100644 bors.toml diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 40171b43..a7ef713d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ # Contributing -First of all, thank you for contributing to Meilisearch! The goal of this document is to provide everything you need to know in order to contribute to Meilisearch and its different integrations. +Thank you for considering contributing to Meilisearch! This document provides everything you need to know in order to contribute to Meilisearch PHP. @@ -14,9 +14,9 @@ First of all, thank you for contributing to Meilisearch! The goal of this docume ## Assumptions -1. **You're familiar with [GitHub](https://github.com) and the [Pull Request](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-requests) (PR) workflow.** -2. **You've read the Meilisearch [documentation](https://docs.meilisearch.com) and the [README](/README.md).** -3. **You know about the [Meilisearch community](https://discord.meilisearch.com). Please use this for help.** +1. **You're familiar with [GitHub](https://github.com) and [Pull Requests](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-requests).** +2. **You've read the Meilisearch [documentation](https://docs.meilisearch.com) and this SDK's [README](/README.md).** +3. **You know about the [Meilisearch community](https://dub.sh/meili-discord?utm_campaign=oss&utm_source=github). Please use this for help.** ## How to Contribute @@ -25,8 +25,9 @@ First of all, thank you for contributing to Meilisearch! The goal of this docume 3. [Create a new Git branch](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-and-deleting-branches-within-your-repository). 4. Review the [Development Workflow](#development-workflow) section that describes the steps to maintain the repository. 5. Make the changes on your branch. -6. [Submit the branch as a PR](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request-from-a-fork) pointing to the `main` branch of the main meilisearch-php repository. A maintainer should comment and/or review your Pull Request within a few days. Although depending on the circumstances, it may take longer.
- We do not enforce a naming convention for the PRs, but **please use something descriptive of your changes**, having in mind that the title of your PR will be automatically added to the next [release changelog](https://github.com/meilisearch/meilisearch-php/releases/). +6. [Submit the branch as a PR](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request-from-a-fork) pointing to the `main` branch of the main meilisearch-php repository. + +Read more about [Git guidelines](#git-guidelines) below. ## Development Workflow @@ -82,7 +83,7 @@ Some notes on GitHub PRs: - [Convert your PR as a draft](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/changing-the-stage-of-a-pull-request) if your changes are a work in progress: no one will review it until you pass your PR as ready for review.
The draft PR can be very useful if you want to show that you are working on something and make your work visible. -- The branch related to the PR must be **up-to-date with `main`** before merging. Fortunately, this project [integrates a bot](https://github.com/meilisearch/integration-guides/blob/main/resources/bors.md) to automatically enforce this requirement without the PR author having to do it manually. +- The branch related to the PR must be **up-to-date with `main`** before merging. This project uses [Merge Queues](https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue) to automatically enforce this requirement. - All PRs must be reviewed and approved by at least one maintainer. - The PR title should be accurate and descriptive of the changes. The title of the PR will be indeed automatically added to the next [release changelogs](https://github.com/meilisearch/meilisearch-php/releases/). @@ -120,4 +121,4 @@ A WebHook will be triggered and push the package to [Packagist](https://packagis
-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 ❤️ +Thank you again for reading this through. ❤️ We're excited to collaborate with you! diff --git a/bors.toml b/bors.toml deleted file mode 100644 index 2eac0386..00000000 --- a/bors.toml +++ /dev/null @@ -1,39 +0,0 @@ -status = [ - 'linter-check', - 'phpstan-tests', - - 'integration-tests (PHP 7.4) (Guzzle-7)', - 'integration-tests (PHP 7.4) (Guzzle-7-Adapter)', - 'integration-tests (PHP 7.4) (PHP-HTTP-CurlClient)', - 'integration-tests (PHP 7.4) (Kriswallsmith-Buzz)', - - 'integration-tests (PHP 8.0) (Guzzle-7)', - 'integration-tests (PHP 8.0) (Guzzle-7-Adapter)', - 'integration-tests (PHP 8.0) (PHP-HTTP-CurlClient)', - 'integration-tests (PHP 8.0) (Kriswallsmith-Buzz)', - - 'integration-tests (PHP 8.1) (Guzzle-7)', - 'integration-tests (PHP 8.1) (Guzzle-7-Adapter)', - 'integration-tests (PHP 8.1) (PHP-HTTP-CurlClient)', - 'integration-tests (PHP 8.1) (Kriswallsmith-Buzz)', - - 'integration-tests (PHP 8.2) (Guzzle-7)', - 'integration-tests (PHP 8.2) (Guzzle-7-Adapter)', - 'integration-tests (PHP 8.2) (Symfony-HttpClient)', - 'integration-tests (PHP 8.2) (PHP-HTTP-CurlClient)', - 'integration-tests (PHP 8.2) (Kriswallsmith-Buzz)', - - 'integration-tests (PHP 8.3) (Guzzle-7)', - 'integration-tests (PHP 8.3) (Guzzle-7-Adapter)', - 'integration-tests (PHP 8.3) (Symfony-HttpClient)', - 'integration-tests (PHP 8.3) (PHP-HTTP-CurlClient)', - 'integration-tests (PHP 8.3) (Kriswallsmith-Buzz)', - - 'integration-tests (PHP 8.4) (Guzzle-7)', - 'integration-tests (PHP 8.4) (Guzzle-7-Adapter)', - 'integration-tests (PHP 8.4) (Symfony-HttpClient)', - 'integration-tests (PHP 8.4) (PHP-HTTP-CurlClient)', - 'integration-tests (PHP 8.4) (Kriswallsmith-Buzz)', -] -# 1 hour timeout -timeout-sec = 3600 From 621e53fff1e783fe2f43d74b164dab85928dbde5 Mon Sep 17 00:00:00 2001 From: Strift Date: Wed, 24 Sep 2025 13:20:28 +0800 Subject: [PATCH 3/6] Update contributing.md --- CONTRIBUTING.md | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a7ef713d..8b91f6c3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -91,15 +91,9 @@ Some notes on GitHub PRs: Meilisearch tools follow the [Semantic Versioning Convention](https://semver.org/). -### Automation to Rebase and Merge the PRs - -This project integrates a bot that helps us manage pull requests merging.
-_[Read more about this](https://github.com/meilisearch/integration-guides/blob/main/resources/bors.md)._ - ### Automated Changelogs -This project integrates a tool to create automated changelogs.
-_[Read more about this](https://github.com/meilisearch/integration-guides/blob/main/resources/release-drafter.md)._ +This project uses [Release Drafter](https://github.com/release-drafter/release-drafter) to automate changelog creation. ### How to Publish the Release @@ -121,4 +115,4 @@ A WebHook will be triggered and push the package to [Packagist](https://packagis
-Thank you again for reading this through. ❤️ We're excited to collaborate with you! +Thank you for reading this through ❤️ We're excited to collaborate with you! From ebcb3e469dc6bd60a695f212ca16ac16efac800a Mon Sep 17 00:00:00 2001 From: Strift Date: Wed, 24 Sep 2025 13:25:07 +0800 Subject: [PATCH 4/6] rebase --- .gitattributes | 1 - .github/release-draft-template.yml | 2 +- README.md | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitattributes b/.gitattributes index 6c8f9acc..aabc9c85 100644 --- a/.gitattributes +++ b/.gitattributes @@ -6,7 +6,6 @@ .gitattributes export-ignore .gitignore export-ignore .php-cs-fixer.dist.php export-ignore -bors.toml export-ignore CONTRIBUTING.md export-ignore phpstan.neon export-ignore phpunit.xml.dist export-ignore diff --git a/.github/release-draft-template.yml b/.github/release-draft-template.yml index 7e943971..74b48846 100644 --- a/.github/release-draft-template.yml +++ b/.github/release-draft-template.yml @@ -36,7 +36,7 @@ template: | no-changes-template: "Changes are coming soon 😎" sort-direction: "ascending" replacers: - - search: '/(?:and )?@meili-bors(?:\[bot\])?,?/g' + - search: '/(?:and )?@dependabot-preview(?:\[bot\])?,?/g' replace: "" - search: "/(?:and )?@meili-bot,?/g" replace: "" diff --git a/README.md b/README.md index 3ff2af24..5550c0eb 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,6 @@ Latest Stable Version Test License - Bors enabled

⚡ The Meilisearch API client written for PHP 🐘

From 013e5c4106530b7d9ebe89811935242a6a1273f2 Mon Sep 17 00:00:00 2001 From: Strift Date: Fri, 26 Sep 2025 13:31:18 +0800 Subject: [PATCH 5/6] list dependabot in release draft contributors --- .github/release-draft-template-v1.yml | 6 ------ .github/release-draft-template.yml | 2 -- 2 files changed, 8 deletions(-) diff --git a/.github/release-draft-template-v1.yml b/.github/release-draft-template-v1.yml index 8c881876..8b4b5148 100644 --- a/.github/release-draft-template-v1.yml +++ b/.github/release-draft-template-v1.yml @@ -35,11 +35,5 @@ template: | no-changes-template: "Changes are coming soon 😎" sort-direction: "ascending" replacers: - - search: '/(?:and )?@dependabot-preview(?:\[bot\])?,?/g' - replace: "" - - search: '/(?:and )?@meili-bors(?:\[bot\])?,?/g' - replace: "" - search: "/(?:and )?@meili-bot,?/g" replace: "" - - search: '/(?:and )?@dependabot(?:\[bot\])?,?/g' - replace: "" diff --git a/.github/release-draft-template.yml b/.github/release-draft-template.yml index 74b48846..abd3bcf8 100644 --- a/.github/release-draft-template.yml +++ b/.github/release-draft-template.yml @@ -36,7 +36,5 @@ template: | no-changes-template: "Changes are coming soon 😎" sort-direction: "ascending" replacers: - - search: '/(?:and )?@dependabot-preview(?:\[bot\])?,?/g' - replace: "" - search: "/(?:and )?@meili-bot,?/g" replace: "" From b84a1426ebedb252cae1f88ea3845f4b7a2abe78 Mon Sep 17 00:00:00 2001 From: Strift Date: Thu, 2 Oct 2025 16:09:39 +0800 Subject: [PATCH 6/6] Add merge group to CI for beta and pre-release branches --- .github/workflows/meilisearch-beta-tests.yml | 12 +++++++----- .github/workflows/pre-release-tests.yml | 12 +++++++----- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.github/workflows/meilisearch-beta-tests.yml b/.github/workflows/meilisearch-beta-tests.yml index 73b35800..728c361e 100644 --- a/.github/workflows/meilisearch-beta-tests.yml +++ b/.github/workflows/meilisearch-beta-tests.yml @@ -4,9 +4,11 @@ name: Meilisearch Prototype Beta tests # Will only run for PRs and pushes to *-beta on: push: - branches: ['meilisearch-*-beta'] + branches: ["meilisearch-*-beta"] pull_request: - branches: ['meilisearch-*-beta'] + branches: ["meilisearch-*-beta"] + merge_group: + branches: ["meilisearch-*-beta"] jobs: meilisearch-version: @@ -26,19 +28,19 @@ jobs: tests: runs-on: ubuntu-latest - needs: ['meilisearch-version'] + needs: ["meilisearch-version"] name: integration-tests-against-rc (PHP ${{ matrix.php-version }}) services: meilisearch: image: getmeili/meilisearch:${{ needs.meilisearch-version.outputs.version }} ports: - - '7700:7700' + - "7700:7700" env: MEILI_MASTER_KEY: masterKey MEILI_NO_ANALYTICS: true strategy: matrix: - php-version: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4'] + php-version: ["7.4", "8.0", "8.1", "8.2", "8.3", "8.4"] steps: - name: Checkout code diff --git a/.github/workflows/pre-release-tests.yml b/.github/workflows/pre-release-tests.yml index 4cc0e77c..09cc1978 100644 --- a/.github/workflows/pre-release-tests.yml +++ b/.github/workflows/pre-release-tests.yml @@ -4,9 +4,11 @@ name: Pre-Release Tests # Will only run for PRs and pushes to bump-meilisearch-v* on: push: - branches: ['bump-meilisearch-v*'] + branches: ["bump-meilisearch-v*"] pull_request: - branches: ['bump-meilisearch-v*'] + branches: ["bump-meilisearch-v*"] + merge_group: + branches: ["bump-meilisearch-v*"] jobs: meilisearch-version: @@ -26,19 +28,19 @@ jobs: tests: runs-on: ubuntu-latest - needs: ['meilisearch-version'] + needs: ["meilisearch-version"] name: integration-tests-against-rc (PHP ${{ matrix.php-version }}) services: meilisearch: image: getmeili/meilisearch:${{ needs.meilisearch-version.outputs.version }} ports: - - '7700:7700' + - "7700:7700" env: MEILI_MASTER_KEY: masterKey MEILI_NO_ANALYTICS: true strategy: matrix: - php-version: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4'] + php-version: ["7.4", "8.0", "8.1", "8.2", "8.3", "8.4"] steps: - name: Checkout code