Skip to content

Commit 28f1d4b

Browse files
StriftStrift
authored
Merge branch 'main' into feature/sort-documents
2 parents c44c665 + f37c708 commit 28f1d4b

16 files changed

+188
-55
lines changed

‎.github/dependabot.yml‎

Lines changed: 35 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,49 @@
11
version: 2
22
updates:
3+
# GitHub Actions - main branch
34
- package-ecosystem: "github-actions"
45
directory: "/"
6+
target-branch: "main"
57
schedule:
68
interval: "monthly"
79
labels:
8-
- 'skip-changelog'
9-
- 'dependencies'
10-
rebase-strategy: disabled
10+
- "skip-changelog"
11+
- "dependencies"
12+
rebase-strategy: "disabled"
1113

12-
- package-ecosystem: composer
14+
# GitHub Actions - v1.x branch
15+
- package-ecosystem: "github-actions"
16+
directory: "/"
17+
target-branch: "v1.x"
18+
schedule:
19+
interval: "monthly"
20+
labels:
21+
- "skip-changelog"
22+
- "dependencies"
23+
rebase-strategy: "disabled"
24+
25+
# Composer - main branch
26+
- package-ecosystem: "composer"
27+
directory: "/"
28+
target-branch: "main"
29+
schedule:
30+
interval: "monthly"
31+
time: "04:00"
32+
open-pull-requests-limit: 10
33+
labels:
34+
- "skip-changelog"
35+
- "dependencies"
36+
rebase-strategy: "disabled"
37+
38+
# Composer - v1.x branch
39+
- package-ecosystem: "composer"
1340
directory: "/"
41+
target-branch: "v1.x"
1442
schedule:
1543
interval: "monthly"
1644
time: "04:00"
1745
open-pull-requests-limit: 10
1846
labels:
19-
- skip-changelog
20-
- dependencies
21-
rebase-strategy: disabled
47+
- "skip-changelog"
48+
- "dependencies"
49+
rebase-strategy: "disabled"

‎.github/release-draft-template-v1.yml‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
name-template: "v$RESOLVED_VERSION 🔒"
2+
tag-template: "v$RESOLVED_VERSION"
3+
exclude-labels:
4+
- "skip-changelog"
5+
version-resolver:
6+
major:
7+
labels:
8+
- "breaking-change"
9+
minor:
10+
labels:
11+
- "enhancement"
12+
default: patch
13+
categories:
14+
- title: "⚠️ Breaking changes"
15+
label: "breaking-change"
16+
- title: "🚀 Enhancements"
17+
label: "enhancement"
18+
- title: "🐛 Bug Fixes"
19+
label: "bug"
20+
- title: "🔒 Security"
21+
label: "security"
22+
- title: "⚙️ Maintenance/misc"
23+
label:
24+
- "maintenance"
25+
- "documentation"
26+
template: |
27+
## What's Changed in v1.x
28+
29+
This is a maintenance release for the v1.x series. For the latest features and improvements, please consider upgrading to v2.x.
30+
31+
$CHANGES
32+
33+
**Full Changelog**: https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...v$RESOLVED_VERSION
34+
35+
Thanks to all contributors! 🎉
36+
$CONTRIBUTORS
37+
no-changes-template: "Changes are coming soon 😎"
38+
sort-direction: "ascending"
39+
replacers:
40+
- search: '/(?:and )?@dependabot-preview(?:\[bot\])?,?/g'
41+
replace: ""
42+
- search: '/(?:and )?@meili-bors(?:\[bot\])?,?/g'
43+
replace: ""
44+
- search: "/(?:and )?@meili-bot,?/g"
45+
replace: ""
46+
- search: '/(?:and )?@dependabot(?:\[bot\])?,?/g'
47+
replace: ""

‎.github/release-draft-template.yml‎

Lines changed: 30 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,46 @@
1-
name-template: 'v$RESOLVED_VERSION 🐘'
2-
tag-template: 'v$RESOLVED_VERSION'
1+
name-template: "v$RESOLVED_VERSION 🚀"
2+
tag-template: "v$RESOLVED_VERSION"
33
exclude-labels:
4-
- 'skip-changelog'
4+
- "skip-changelog"
55
version-resolver:
66
major:
77
labels:
8-
- 'breaking-change'
8+
- "breaking-change"
99
minor:
1010
labels:
11-
- 'enhancement'
11+
- "enhancement"
1212
default: patch
13+
# Set initial version for v2.x releases
14+
version-template: "2.0.0"
1315
categories:
14-
- title: '⚠️ Breaking changes'
15-
label: 'breaking-change'
16-
- title: '🚀 Enhancements'
17-
label: 'enhancement'
18-
- title: '🐛 Bug Fixes'
19-
label: 'bug'
20-
- title: '🔒 Security'
21-
label: 'security'
22-
- title: '⚙️ Maintenance/misc'
16+
- title: "⚠️ Breaking changes"
17+
label: "breaking-change"
18+
- title: "🚀 Enhancements"
19+
label: "enhancement"
20+
- title: "🐛 Bug Fixes"
21+
label: "bug"
22+
- title: "🔒 Security"
23+
label: "security"
24+
- title: "⚙️ Maintenance/misc"
2325
label:
24-
- 'maintenance'
25-
- 'documentation'
26+
- "maintenance"
27+
- "documentation"
2628
template: |
29+
## What's Changed
2730
$CHANGES
2831
29-
Thanks again to $CONTRIBUTORS! 🎉
30-
no-changes-template: 'Changes are coming soon 😎'
31-
sort-direction: 'ascending'
32+
**Full Changelog**: https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...v$RESOLVED_VERSION
33+
34+
Thanks to all contributors! 🎉
35+
$CONTRIBUTORS
36+
no-changes-template: "Changes are coming soon 😎"
37+
sort-direction: "ascending"
3238
replacers:
3339
- search: '/(?:and )?@dependabot-preview(?:\[bot\])?,?/g'
34-
replace: ''
40+
replace: ""
3541
- search: '/(?:and )?@meili-bors(?:\[bot\])?,?/g'
36-
replace: ''
37-
- search: '/(?:and )?@meili-bot,?/g'
38-
replace: ''
42+
replace: ""
43+
- search: "/(?:and )?@meili-bot,?/g"
44+
replace: ""
3945
- search: '/(?:and )?@dependabot(?:\[bot\])?,?/g'
40-
replace: ''
46+
replace: ""

‎.github/workflows/docs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
DOCUMENTATION_TITLE: "Meilisearch PHP | Documentation"
2121
steps:
2222
- name: Checkout
23-
uses: actions/checkout@v4
23+
uses: actions/checkout@v5
2424
- name: Configure GitHub Pages
2525
uses: actions/configure-pages@v5
2626
- name: Cache phpDocumentor build files

‎.github/workflows/meilisearch-beta-tests.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Checkout code
16-
uses: actions/checkout@v4
16+
uses: actions/checkout@v5
1717

1818
- name: Grep docker beta version of Meilisearch
1919
id: grep-step
@@ -42,12 +42,12 @@ jobs:
4242

4343
steps:
4444
- name: Checkout code
45-
uses: actions/checkout@v4
45+
uses: actions/checkout@v5
4646

4747
- name: Install PHP
4848
uses: shivammathur/setup-php@v2
4949
with:
50-
php-version: ${{ matrix.php-versions }}
50+
php-version: ${{ matrix.php-version }}
5151

5252
- name: Validate composer.json and composer.lock
5353
run: composer validate

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Checkout code
16-
uses: actions/checkout@v4
16+
uses: actions/checkout@v5
1717

1818
- name: Grep docker latest rc version of Meilisearch
1919
id: grep-step
@@ -27,7 +27,7 @@ jobs:
2727
tests:
2828
runs-on: ubuntu-latest
2929
needs: ['meilisearch-version']
30-
name: integration-tests-against-rc (PHP ${{ matrix.php-versions }})
30+
name: integration-tests-against-rc (PHP ${{ matrix.php-version }})
3131
services:
3232
meilisearch:
3333
image: getmeili/meilisearch:${{ needs.meilisearch-version.outputs.version }}
@@ -42,12 +42,12 @@ jobs:
4242

4343
steps:
4444
- name: Checkout code
45-
uses: actions/checkout@v4
45+
uses: actions/checkout@v5
4646

4747
- name: Install PHP
4848
uses: shivammathur/setup-php@v2
4949
with:
50-
php-version: ${{ matrix.php-versions }}
50+
php-version: ${{ matrix.php-version }}
5151
coverage: none
5252

5353
- name: Validate composer.json and composer.lock

‎.github/workflows/release-drafter.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@ on:
44
push:
55
branches:
66
- main
7+
- v1.x
78

89
jobs:
910
update_release_draft:
1011
runs-on: ubuntu-latest
1112
steps:
1213
- uses: release-drafter/release-drafter@v6
1314
with:
14-
config-name: release-draft-template.yml
15+
config-name: ${{ github.ref_name == 'v1.x' && 'release-draft-template-v1.yml' || 'release-draft-template.yml' }}
1516
env:
1617
GITHUB_TOKEN: ${{ secrets.RELEASE_DRAFTER_TOKEN }}

‎.github/workflows/tests.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,15 @@ on:
99
- staging
1010
- main
1111
- feature/**
12+
- v1.x
1213

1314
jobs:
1415
yaml-lint:
1516
name: Yaml linting check
1617
runs-on: ubuntu-latest
1718
steps:
1819
- name: Checkout code
19-
uses: actions/checkout@v4
20+
uses: actions/checkout@v5
2021

2122
- name: Yaml lint check
2223
uses: ibiqlik/action-yamllint@v3
@@ -30,7 +31,7 @@ jobs:
3031
PHP_CS_FIXER_IGNORE_ENV: 1
3132
steps:
3233
- name: Checkout code
33-
uses: actions/checkout@v4
34+
uses: actions/checkout@v5
3435

3536
- name: Install PHP
3637
uses: shivammathur/setup-php@v2
@@ -49,7 +50,7 @@ jobs:
4950
name: phpstan-tests
5051
steps:
5152
- name: Checkout code
52-
uses: actions/checkout@v4
53+
uses: actions/checkout@v5
5354

5455
- name: Install PHP
5556
uses: shivammathur/setup-php@v2
@@ -82,7 +83,7 @@ jobs:
8283
php-version: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
8384

8485
steps:
85-
- uses: actions/checkout@v4
86+
- uses: actions/checkout@v5
8687

8788
- name: Install PHP
8889
uses: shivammathur/setup-php@v2
@@ -113,7 +114,7 @@ jobs:
113114

114115
steps:
115116
- name: Checkout
116-
uses: actions/checkout@v4
117+
uses: actions/checkout@v5
117118
with:
118119
fetch-depth: 2
119120

‎.github/workflows/update-version.yml‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@ on:
66
new_version:
77
description: 'The new version (vX.Y.Z)'
88
required: true
9+
target_branch:
10+
description: 'Target branch for the version update'
11+
required: true
12+
type: choice
13+
options:
14+
- main
15+
- v1.x
916

1017
env:
1118
NEW_VERSION: ${{ github.event.inputs.new_version }}
@@ -17,7 +24,9 @@ jobs:
1724
name: Update version in Meilisearch.php
1825
runs-on: ubuntu-latest
1926
steps:
20-
- uses: actions/checkout@v4
27+
- uses: actions/checkout@v5
28+
with:
29+
ref: ${{ github.event.inputs.target_branch }}
2130
- name: Update Meilisearch.php file
2231
run: |
2332
raw_new_version=$(echo $NEW_VERSION | cut -d 'v' -f 2)
@@ -28,10 +37,11 @@ jobs:
2837
with:
2938
message: "Update version for the next release (${{ env.NEW_VERSION }}) in Meilisearch.php"
3039
new_branch: ${{ env.NEW_BRANCH }}
31-
- name: Create the PR pointing to ${{ github.ref_name }}
40+
- name: Create the PR pointing to ${{ github.event.inputs.target_branch }}
3241
run: |
3342
gh pr create \
3443
--title "Update version for the next release ($NEW_VERSION)" \
3544
--body '⚠️ This PR is automatically generated. Check the new version is the expected one.' \
3645
--label 'skip-changelog' \
37-
--base $GITHUB_REF_NAME
46+
--base ${{ github.event.inputs.target_branch }} \
47+
--head ${{ env.NEW_BRANCH }}

‎composer.json‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,20 @@
1313
"license": "MIT",
1414
"authors": [
1515
{
16-
"name": "Clementine",
16+
"name": "Clémentine Urquizar",
1717
"email": "[email protected]"
18+
},
19+
{
20+
"name": "Bruno Casali",
21+
"email": "[email protected]"
22+
},
23+
{
24+
"name": "Laurent Cazanove",
25+
"email": "[email protected]"
26+
},
27+
{
28+
"name": "Tomas Norkūnas",
29+
"email": "[email protected]"
1830
}
1931
],
2032
"minimum-stability": "stable",
@@ -59,7 +71,9 @@
5971
"./vendor/bin/php-cs-fixer fix --verbose --config=.php-cs-fixer.dist.php --using-cache=no --diff"
6072
],
6173
"phpstan": "./vendor/bin/phpstan",
62-
"test": ["sh scripts/tests.sh"]
74+
"test": [
75+
"sh scripts/tests.sh"
76+
]
6377
},
6478
"config": {
6579
"allow-plugins": {

0 commit comments

Comments
 (0)