Skip to content

Commit 1e3a934

Browse files
shortcutsshortcuts
authored
Merge branch 'main' into chore/specs-doc-bundled-location
2 parents 9798fe0 + fd58f03 commit 1e3a934

File tree

12 files changed

+98
-68
lines changed

12 files changed

+98
-68
lines changed

‎clients/algoliasearch-client-dart/.github/workflows/release.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,18 @@ jobs:
2929
with:
3030
working-directory: packages/client_core
3131

32+
wait_for_core:
33+
needs: publish_core
34+
runs-on: ubuntu-latest
35+
steps:
36+
- name: Wait for core package to be published
37+
shell: bash
38+
run: sleep 300
39+
3240
publish_clients:
3341
needs:
3442
- check
35-
- publish_core
43+
- wait_for_core
3644
strategy:
3745
matrix:
3846
package:

‎clients/algoliasearch-client-ruby/.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Install Ruby
2222
uses: ruby/setup-ruby@v1
2323
with:
24-
ruby-version: 3.2.2
24+
ruby-version: 3.3.6
2525
bundler-cache: true
2626

2727
- uses: rubygems/release-gem@a25424ba2ba8b387abc8ef40807c2c85b96cbe32

‎clients/algoliasearch-client-ruby/Gemfile.lock

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,29 +12,31 @@ GEM
1212
specs:
1313
base64 (0.2.0)
1414
connection_pool (2.4.1)
15-
faraday (2.11.0)
16-
faraday-net_http (>= 2.0, < 3.4)
15+
faraday (2.12.2)
16+
faraday-net_http (>= 2.0, < 3.5)
17+
json
1718
logger
18-
faraday-net_http (3.3.0)
19-
net-http
20-
faraday-net_http_persistent (2.1.0)
19+
faraday-net_http (3.4.0)
20+
net-http (>= 0.5.0)
21+
faraday-net_http_persistent (2.3.0)
2122
faraday (~> 2.5)
22-
net-http-persistent (~> 4.0)
23-
logger (1.6.1)
24-
net-http (0.4.1)
23+
net-http-persistent (>= 4.0.4, < 5)
24+
json (2.9.0)
25+
logger (1.6.2)
26+
net-http (0.6.0)
2527
uri
26-
net-http-persistent (4.0.4)
28+
net-http-persistent (4.0.5)
2729
connection_pool (~> 2.2)
2830
rake (13.2.1)
29-
uri (0.13.1)
31+
uri (1.0.2)
3032

3133
PLATFORMS
3234
aarch64-linux
3335
x86_64-linux
3436

3537
DEPENDENCIES
3638
algolia!
37-
bundler
39+
bundler (>= 2.4.10)
3840
rake
3941

4042
BUNDLED WITH

‎clients/algoliasearch-client-ruby/algolia.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@ Gem::Specification.new do |s|
3030

3131
s.add_dependency 'net-http-persistent'
3232

33-
s.add_development_dependency 'bundler'
33+
s.add_development_dependency 'bundler', '>= 2.4.10'
3434
s.add_development_dependency 'rake'
3535
end

‎clients/algoliasearch-client-ruby/lib/algolia/api/search_client.rb

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3533,13 +3533,16 @@ def replace_all_objects(index_name, objects, batch_size = 1000, request_options
35333533
def index_exists?(index_name)
35343534
begin
35353535
get_settings(index_name)
3536-
rescue AlgoliaHttpError => e
3537-
return false if e.code == 404
3536+
rescue Exception => e
3537+
if e.is_a?(AlgoliaHttpError)
3538+
return false if e.code == 404
35383539

3539-
raise e
3540+
raise e
3541+
end
35403542
end
35413543

35423544
true
35433545
end
3546+
35443547
end
35453548
end

‎config/generation.config.mjs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ export const patterns = [
4040
'clients/algoliasearch-client-dart/packages/client_core/lib/src/version.dart',
4141
'!clients/algoliasearch-client-dart/packages/*/lib/src/extension.dart',
4242
'!clients/algoliasearch-client-dart/packages/algoliasearch/lib/algoliasearch.dart',
43+
'!clients/algoliasearch-client-dart/.github/workflows/release.yml',
4344

4445
// GO
4546
'clients/algoliasearch-client-go/algolia/**',

‎docs/guides/ruby/Gemfile.lock

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,23 @@ GEM
1313
base64 (0.2.0)
1414
connection_pool (2.4.1)
1515
dotenv (3.1.4)
16-
faraday (2.12.0)
17-
faraday-net_http (>= 2.0, < 3.4)
16+
faraday (2.12.2)
17+
faraday-net_http (>= 2.0, < 3.5)
1818
json
1919
logger
20-
faraday-net_http (3.3.0)
21-
net-http
20+
faraday-net_http (3.4.0)
21+
net-http (>= 0.5.0)
2222
faraday-net_http_persistent (2.3.0)
2323
faraday (~> 2.5)
2424
net-http-persistent (>= 4.0.4, < 5)
25-
json (2.7.2)
26-
logger (1.6.1)
27-
net-http (0.4.1)
25+
json (2.9.0)
26+
logger (1.6.2)
27+
net-http (0.6.0)
2828
uri
29-
net-http-persistent (4.0.4)
29+
net-http-persistent (4.0.5)
3030
connection_pool (~> 2.2)
3131
rake (13.2.1)
32-
uri (0.13.1)
32+
uri (1.0.2)
3333

3434
PLATFORMS
3535
ruby
@@ -41,4 +41,4 @@ DEPENDENCIES
4141
rake
4242

4343
BUNDLED WITH
44-
2.5.16
44+
2.5.23

‎docs/snippets/ruby/Gemfile.lock

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,23 @@ GEM
1313
base64 (0.2.0)
1414
connection_pool (2.4.1)
1515
dotenv (3.1.4)
16-
faraday (2.12.0)
17-
faraday-net_http (>= 2.0, < 3.4)
16+
faraday (2.12.2)
17+
faraday-net_http (>= 2.0, < 3.5)
1818
json
1919
logger
20-
faraday-net_http (3.3.0)
21-
net-http
20+
faraday-net_http (3.4.0)
21+
net-http (>= 0.5.0)
2222
faraday-net_http_persistent (2.3.0)
2323
faraday (~> 2.5)
2424
net-http-persistent (>= 4.0.4, < 5)
25-
json (2.7.2)
26-
logger (1.6.1)
27-
net-http (0.4.1)
25+
json (2.9.0)
26+
logger (1.6.2)
27+
net-http (0.6.0)
2828
uri
29-
net-http-persistent (4.0.4)
29+
net-http-persistent (4.0.5)
3030
connection_pool (~> 2.2)
3131
rake (13.2.1)
32-
uri (0.13.1)
32+
uri (1.0.2)
3333

3434
PLATFORMS
3535
ruby
@@ -41,4 +41,4 @@ DEPENDENCIES
4141
rake
4242

4343
BUNDLED WITH
44-
2.5.16
44+
2.5.23

‎playground/ruby/Gemfile.lock

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: ../../clients/algoliasearch-client-ruby
33
specs:
4-
algolia (3.5.1)
4+
algolia (3.10.0)
55
base64 (>= 0.2.0, < 1)
66
faraday (>= 1.0.1, < 3.0)
77
faraday-net_http_persistent (>= 0.15, < 3)
@@ -12,21 +12,23 @@ GEM
1212
specs:
1313
base64 (0.2.0)
1414
connection_pool (2.4.1)
15-
dotenv (3.1.2)
16-
faraday (2.11.0)
17-
faraday-net_http (>= 2.0, < 3.4)
15+
dotenv (3.1.4)
16+
faraday (2.12.2)
17+
faraday-net_http (>= 2.0, < 3.5)
18+
json
1819
logger
19-
faraday-net_http (3.3.0)
20-
net-http
21-
faraday-net_http_persistent (2.1.0)
20+
faraday-net_http (3.4.0)
21+
net-http (>= 0.5.0)
22+
faraday-net_http_persistent (2.3.0)
2223
faraday (~> 2.5)
23-
net-http-persistent (~> 4.0)
24-
logger (1.6.1)
25-
net-http (0.4.1)
24+
net-http-persistent (>= 4.0.4, < 5)
25+
json (2.9.0)
26+
logger (1.6.2)
27+
net-http (0.6.0)
2628
uri
27-
net-http-persistent (4.0.4)
29+
net-http-persistent (4.0.5)
2830
connection_pool (~> 2.2)
29-
uri (0.13.1)
31+
uri (1.0.2)
3032

3133
PLATFORMS
3234
aarch64-linux
@@ -37,4 +39,4 @@ DEPENDENCIES
3739
dotenv
3840

3941
BUNDLED WITH
40-
2.4.10
42+
2.5.23

‎renovate.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,16 @@
207207
"datasourceTemplate": "ruby-version",
208208
"depNameTemplate": "ruby"
209209
},
210+
{
211+
"customType": "regex",
212+
"description": "Update ruby version on CI",
213+
"fileMatch": "clients/algoliasearch-client-ruby/.github/workflows/release.yml",
214+
"matchStrings": [
215+
"ruby-version: (?<currentValue>.*)"
216+
],
217+
"datasourceTemplate": "ruby-version",
218+
"depNameTemplate": "ruby"
219+
},
210220
{
211221
"customType": "regex",
212222
"description": "Update .swift-version",

‎templates/ruby/search_helpers.mustache

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -396,11 +396,13 @@ end
396396
def index_exists?(index_name)
397397
begin
398398
get_settings(index_name)
399-
rescue AlgoliaHttpError => e
400-
return false if e.code == 404
399+
rescue Exception => e
400+
if e.is_a?(AlgoliaHttpError)
401+
return false if e.code == 404
401402

402-
raise e
403+
raise e
404+
end
403405
end
404406

405407
true
406-
end
408+
end

‎tests/output/ruby/Gemfile.lock

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,27 @@ GEM
1212
specs:
1313
base64 (0.2.0)
1414
connection_pool (2.4.1)
15-
dotenv (3.1.2)
16-
faraday (2.11.0)
17-
faraday-net_http (>= 2.0, < 3.4)
15+
dotenv (3.1.4)
16+
faraday (2.12.2)
17+
faraday-net_http (>= 2.0, < 3.5)
18+
json
1819
logger
19-
faraday-net_http (3.3.0)
20-
net-http
21-
faraday-net_http_persistent (2.1.0)
20+
faraday-net_http (3.4.0)
21+
net-http (>= 0.5.0)
22+
faraday-net_http_persistent (2.3.0)
2223
faraday (~> 2.5)
23-
net-http-persistent (~> 4.0)
24-
logger (1.6.1)
25-
net-http (0.4.1)
24+
net-http-persistent (>= 4.0.4, < 5)
25+
json (2.9.0)
26+
logger (1.6.2)
27+
net-http (0.6.0)
2628
uri
27-
net-http-persistent (4.0.4)
29+
net-http-persistent (4.0.5)
2830
connection_pool (~> 2.2)
29-
power_assert (2.0.3)
31+
power_assert (2.0.4)
3032
rake (13.2.1)
31-
test-unit (3.6.2)
33+
test-unit (3.6.4)
3234
power_assert
33-
uri (0.13.1)
35+
uri (1.0.2)
3436

3537
PLATFORMS
3638
aarch64-linux
@@ -43,4 +45,4 @@ DEPENDENCIES
4345
test-unit
4446

4547
BUNDLED WITH
46-
2.4.10
48+
2.5.23

0 commit comments

Comments
 (0)