Skip to content

Commit 8d8925c

Browse files
Merge #1039
1039: Fix pre-release CI not triggering r=bidoubiwa a=bidoubiwa When a push occurs on a branch pointing to a bump branch, the `push` action does not trigger as it does not match the required branch patterns. When a pull_request activity on a bump branch occurs, the pre-release tests were triggered but because of the wrong if condition, the jobs were not executed. The if condition should ensure that the base branch corresponds to the pull_request branch patterns. Which is now the case Co-authored-by: Charlotte Vermandel <[email protected]>
2 parents 04a2863 + d38587d commit 8d8925c

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@ on:
1313
- 'pre-release-beta/**'
1414

1515
jobs:
16+
1617
meilisearch-version:
1718
runs-on: ubuntu-latest
18-
if: github.event_name != 'pull_request' || !startsWith(github.base_ref, 'bump-meilisearch-v')
19+
if: github.event_name != 'pull_request' || startsWith(github.base_ref, 'bump-meilisearch-v') || startsWith(github.base_ref, 'pre-release-beta')
1920
outputs:
2021
version: ${{ steps.grep-step.outputs.meilisearch_version }}
2122
steps:
@@ -27,7 +28,7 @@ jobs:
2728
echo "meilisearch_version=$MEILISEARCH_VERSION" >> $GITHUB_OUTPUT
2829
cypress-run:
2930
runs-on: ubuntu-latest
30-
if: github.event_name != 'pull_request' || !startsWith(github.base_ref, 'bump-meilisearch-v')
31+
if: github.event_name != 'pull_request' || startsWith(github.base_ref, 'bump-meilisearch-v') || startsWith(github.base_ref, 'pre-release-beta')
3132
needs: ['meilisearch-version']
3233
services:
3334
meilisearch:
@@ -68,7 +69,7 @@ jobs:
6869
path: cypress/videos
6970
integration_tests:
7071
runs-on: ubuntu-latest
71-
if: github.event_name != 'pull_request' || !startsWith(github.base_ref, 'bump-meilisearch-v')
72+
if: github.event_name != 'pull_request' || startsWith(github.base_ref, 'bump-meilisearch-v') || startsWith(github.base_ref, 'pre-release-beta')
7273
needs: ['meilisearch-version']
7374
services:
7475
meilisearch:

0 commit comments

Comments
 (0)