Skip to content

Commit 13d0db2

Browse files
authored
Merge pull request #1242 from pat/build/manticore-6.0.0
build: test against Manticore 6.0.
2 parents 3e91a90 + 99351eb commit 13d0db2

File tree

3 files changed

+18
-7
lines changed

3 files changed

+18
-7
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
ruby: [ '2.7', '3.0', '3.1', '3.2' ]
7878
rails: [ '5_0', '5_1', '5_2', '6_0', '6_1', '7_0' ]
7979
database: [ 'mysql2', 'postgresql' ]
80-
sphinx_version: [ '3.5.4', '4.0.2' ]
80+
sphinx_version: [ '4.0.2', '6.0.0' ]
8181
sphinx_engine: [ 'manticore' ]
8282
exclude:
8383
- ruby: '3.0'

README.textile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ The current release of Thinking Sphinx works with the following versions of its
3131
|_. Library |_. Minimum |_. Tested Against |
3232
| Ruby | v2.4 | v2.4, v2.5, v2.6, v2.7, v3.0, v3.1, v3.2 |
3333
| Sphinx | v2.2.11 | v2.2.11, v3.4.1 |
34-
| Manticore | v2.8 | v3.5, v4.0 |
34+
| Manticore | v2.8 | v4.0, v6.0 |
3535
| ActiveRecord | v4.2 | v4.2..v7.0 |
3636

3737
It _might_ work with older versions of Ruby, but it's highly recommended to update to a supported release.
@@ -42,7 +42,7 @@ h3. Sphinx or Manticore
4242

4343
If you're using Sphinx, v2.2.11 is recommended even though it's quite old, as it works well with PostgreSQL databases (but if you're using MySQL - or real-time indices - then v3.3.1 should also be fine).
4444

45-
If you're opting for Manticore instead, v2.8 or newer works, but v3 or newer is recommended as that's what is actively tested against.
45+
If you're opting for Manticore instead, v2.8 or newer works, but v4 or newer is recommended as that's what is actively tested against. The v4.2 and 5.0 releases had bugs with facet searching, but that's been fixed in Manticore v6.0.
4646

4747
h3. Rails and ActiveRecord
4848

bin/loadsphinx

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,26 @@ load_manticore () {
7070
url="https://repo.manticoresearch.com/repository/manticoresearch_focal/dists/focal/main/binary-amd64/manticore_3.5.4-210107-f70faec5_amd64.deb";;
7171
4.0.2)
7272
url="https://repo.manticoresearch.com/repository/manticoresearch_focal/dists/focal/main/binary-amd64/manticore_4.0.2-210921-af497f245_amd64.deb";;
73+
4.2.0)
74+
url="https://repo.manticoresearch.com/repository/manticoresearch_focal/dists/focal/main/binary-amd64/manticore_4.2.0-211223-15e927b28_amd64.deb";;
75+
6.0.0)
76+
url="skipped";;
7377
*)
7478
echo "No Manticore version $version available"
7579
exit 1;;
7680
esac
7781

78-
sudo apt-get install default-libmysqlclient-dev
79-
curl --location $url -o manticore.deb
80-
sudo dpkg -i ./manticore.deb
81-
sudo apt-get install -f
82+
if [ "$version" == "6.0.0" ]; then
83+
curl --location https://repo.manticoresearch.com/manticore-repo.noarch.deb -o repo.deb
84+
sudo dpkg -i repo.deb
85+
sudo apt update
86+
sudo apt install manticore
87+
else
88+
sudo apt-get install default-libmysqlclient-dev
89+
curl --location $url -o manticore.deb
90+
sudo dpkg -i ./manticore.deb
91+
sudo apt-get install -f
92+
fi
8293
}
8394

8495
if [ "$engine" == "sphinx" ]; then

0 commit comments

Comments
 (0)