Skip to content

Commit 7acc9d1

Browse files
committed
Put back conditions on CI run
1 parent e1a79d8 commit 7acc9d1

File tree

2 files changed

+9
-30
lines changed

2 files changed

+9
-30
lines changed

.github/workflows/beta-tests.yml

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,12 @@
11
# Testing the code base against a specific Meilisearch feature
22
name: Beta tests
33

4+
# Will only run for PRs and pushes to *-beta
45
on:
5-
pull_request:
66
push:
7-
# trying and staging branches are for BORS config
8-
branches:
9-
- trying
10-
- staging
11-
- main
12-
13-
# TODO: CHANGE
14-
# Will only run for PRs and pushes to *-beta
15-
# on:
16-
# push:
17-
# branches: ['!bump-meilisearch-v*.*.*-beta', '**-beta']
18-
# pull_request:
19-
# branches: ['!bump-meilisearch-v*.*.*-beta', '**-beta']
7+
branches: ['!bump-meilisearch-v*.*.*-beta', '**-beta']
8+
pull_request:
9+
branches: ['!bump-meilisearch-v*.*.*-beta', '**-beta']
2010

2111
jobs:
2212
meilisearch-version:
@@ -30,8 +20,7 @@ jobs:
3020
run: |
3121
MEILISEARCH_VERSION=$(sh .github/scripts/beta-docker-version.sh)
3222
echo $MEILISEARCH_VERSION
33-
# TODO: CHANGE to version::$MEILISEARCH_VERSION
34-
echo ::set-output name=version::latest
23+
echo ::set-output name=version::$MEILISEARCH_VERSION
3524
integration_tests:
3625
runs-on: ubuntu-latest
3726
needs: ['meilisearch-version']

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

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,11 @@
22
name: Pre-Release Tests
33

44
# # Will only run for PRs and pushes to bump-meilisearch-v*
5-
# on:
6-
# push:
7-
# branches: [bump-meilisearch-v*]
8-
# pull_request:
9-
# branches: [bump-meilisearch-v*]
10-
115
on:
12-
pull_request:
136
push:
14-
# trying and staging branches are for BORS config
15-
branches:
16-
- trying
17-
- staging
18-
- main
7+
branches: [bump-meilisearch-v*]
8+
pull_request:
9+
branches: [bump-meilisearch-v*]
1910

2011
jobs:
2112
meilisearch-version:
@@ -29,8 +20,7 @@ jobs:
2920
run: |
3021
MEILISEARCH_VERSION=$(curl https://raw.githubusercontent.com/meilisearch/integration-guides/main/scripts/get-latest-meilisearch-rc.sh | sh)
3122
echo $MEILISEARCH_VERSION
32-
# TODO: CHANGE to version::$MEILISEARCH_VERSION
33-
echo ::set-output name=version::latest
23+
echo ::set-output name=version::$MEILISEARCH_VERSION
3424
integration_tests:
3525
runs-on: ubuntu-latest
3626
needs: ['meilisearch-version']

0 commit comments

Comments
 (0)