Skip to content

Commit

Permalink
Use Sphinx 3.3 in the build matrix.
Browse files Browse the repository at this point in the history
  • Loading branch information
pat committed Jul 24, 2020
1 parent 07cfe1b commit 0df236a
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Expand Up @@ -19,12 +19,12 @@ env:
matrix:
- DATABASE=mysql2 SPHINX_VERSION=2.2.11 SPHINX_ENGINE=sphinx
- DATABASE=postgresql SPHINX_VERSION=2.2.11 SPHINX_ENGINE=sphinx
- DATABASE=mysql2 SPHINX_VERSION=3.2.1 SPHINX_ENGINE=sphinx
- DATABASE=mysql2 SPHINX_VERSION=3.3.1 SPHINX_ENGINE=sphinx
- DATABASE=mysql2 SPHINX_VERSION=2.8.2 SPHINX_ENGINE=manticore
- DATABASE=postgresql SPHINX_VERSION=2.8.2 SPHINX_ENGINE=manticore
- DATABASE=mysql2 SPHINX_VERSION=3.5.0 SPHINX_ENGINE=manticore
- DATABASE=postgresql SPHINX_VERSION=3.5.0 SPHINX_ENGINE=manticore
# - DATABASE=postgresql SPHINX_VERSION=3.2.1 SPHINX_ENGINE=sphinx
# - DATABASE=postgresql SPHINX_VERSION=3.3.1 SPHINX_ENGINE=sphinx
sudo: false
addons:
postgresql: '9.4'
Expand Down
5 changes: 4 additions & 1 deletion bin/loadsphinx
Expand Up @@ -23,7 +23,10 @@ load_sphinx () {
url="http://sphinxsearch.com/files/sphinx-3.1.1-612d99f-linux-amd64.tar.gz"
format="gz";;
3.2.1)
url="http://www.sphinxsearch.com/files/sphinx-3.2.1-f152e0b-linux-amd64.tar.gz"
url="http://sphinxsearch.com/files/sphinx-3.2.1-f152e0b-linux-amd64.tar.gz"
format="gz";;
3.3.1)
url="http://sphinxsearch.com/files/sphinx-3.3.1-b72d67b-linux-amd64.tar.gz"
format="gz";;
*)
echo "No Sphinx version $version available"
Expand Down
4 changes: 2 additions & 2 deletions spec/acceptance/geosearching_spec.rb
Expand Up @@ -39,9 +39,9 @@
end

if ActiveRecord::Base.configurations['test']['adapter'][/postgres/]
expect(cities.first.geodist).to eq(expected[:postgresql])
expect(cities.first.geodist).to be_within(0.01).of(expected[:postgresql])
else # mysql
expect(cities.first.geodist).to eq(expected[:mysql])
expect(cities.first.geodist).to be_within(0.01).of(expected[:mysql])
end
end

Expand Down

0 comments on commit 0df236a

Please sign in to comment.