Skip to content

Commit 7b0d6ed

Browse files
authored
Merge branch 'main' into fix/python-type-check-and-additional-properties
2 parents 1762b1f + 15696dd commit 7b0d6ed

File tree

643 files changed

+16906
-17551
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

643 files changed

+16906
-17551
lines changed

.github/actions/setup/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ runs:
3434
- name: Download Java formatter
3535
if: inputs.type != 'minimal'
3636
shell: bash
37-
run: curl --retry 3 -L "https://github.com/google/google-java-format/releases/download/v1.24.0/google-java-format-1.24.0-all-deps.jar" > /tmp/java-formatter.jar
37+
run: curl --retry 3 -L "https://github.com/google/google-java-format/releases/download/v1.25.0/google-java-format-1.25.0-all-deps.jar" > /tmp/java-formatter.jar
3838

3939
# JavaScript for monorepo and tooling
4040
- name: Install Node

.github/workflows/check.yml

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
runs-on: ubuntu-22.04
4242
timeout-minutes: 10
4343
env:
44-
CACHE_VERSION: 1.11 # bump this to run all clients on the CI.
44+
CACHE_VERSION: 1.13 # bump this to run all clients on the CI.
4545
steps:
4646
- name: debugging - dump GitHub context
4747
env:
@@ -219,11 +219,14 @@ jobs:
219219
run: cd clients/algoliasearch-client-javascript && YARN_ENABLE_HARDENED_MODE=0 YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install
220220

221221
- name: Build clients
222-
run: ${{ fromJSON(needs.setup.outputs.JAVASCRIPT_DATA).buildCommand }}
222+
run: cd clients/algoliasearch-client-javascript && yarn build
223223

224224
- name: Build the playground
225225
run: yarn cli build playground javascript ${{ fromJSON(needs.setup.outputs.JAVASCRIPT_DATA).toRun }}
226226

227+
- name: Build the browser playground
228+
run: yarn workspace javascript-playground-browser build
229+
227230
- name: Run common and requester tests
228231
run: cd clients/algoliasearch-client-javascript && yarn test ${{ !contains(fromJSON(needs.setup.outputs.JAVASCRIPT_DATA).toRun, 'algoliasearch') && '--ignore algoliasearch' || '' }}
229232

@@ -334,6 +337,8 @@ jobs:
334337
- name: Generate clients
335338
run: yarn cli generate ${{ matrix.client.language }} ${{ matrix.client.toRun }}
336339

340+
# no need to build the clients here, it will be done in the Run CTS step anyway.
341+
337342
- name: Update composer.lock
338343
if: ${{ matrix.client.language == 'php' && startsWith(github.head_ref, 'chore/renovateBaseBranch') && matrix.client.isMainVersion }}
339344
run: cd ${{ matrix.client.path }} && composer update
@@ -346,9 +351,6 @@ jobs:
346351
find Sources -type f | rev | cut -d '/' -f1 | rev | sort | uniq -d
347352
[ $(find Sources -type f | rev | cut -d '/' -f1 | rev | sort | uniq -d | wc -l) -gt 0 ] && echo "Duplicates found" && exit 1 || echo "No duplicate found"
348353
349-
- name: Build clients
350-
run: ${{ matrix.client.buildCommand }}
351-
352354
- name: Build the playground
353355
run: yarn cli build playground ${{ matrix.client.language }}
354356

@@ -419,7 +421,8 @@ jobs:
419421
runs-on: macos-latest
420422
needs:
421423
- setup
422-
- client_gen
424+
- specs
425+
- scripts
423426
if: |
424427
always() &&
425428
needs.setup.outputs.RUN_GEN == 'true' &&
@@ -432,18 +435,19 @@ jobs:
432435
steps:
433436
- uses: actions/checkout@v4
434437

435-
- name: Download artifacts
438+
- name: Download specs artifacts
436439
uses: ./scripts/ci/actions/restore-artifacts
437440
with:
438-
type: languages
439-
languages: |
440-
kotlin
441+
type: specs
441442

442443
- name: Setup
443444
uses: ./.github/actions/setup
444445
with:
445-
type: minimal
446446
language: kotlin
447+
version: ${{ fromJSON(needs.setup.outputs.KOTLIN_DATA).version }}
448+
449+
- name: Generate clients
450+
run: yarn cli generate kotlin ${{ fromJSON(needs.setup.outputs.KOTLIN_DATA).toRun }}
447451

448452
- name: Build clients for macOS
449453
id: build
@@ -463,7 +467,8 @@ jobs:
463467
runs-on: macos-latest
464468
needs:
465469
- setup
466-
- client_gen
470+
- specs
471+
- scripts
467472
if: |
468473
always() &&
469474
needs.setup.outputs.RUN_GEN == 'true' &&
@@ -481,22 +486,24 @@ jobs:
481486
- uses: actions/checkout@v4
482487
if: ${{ env.ALGOLIA_APPLICATION_ID != '' }}
483488

484-
- name: Download artifacts
489+
- name: Download specs artifacts
485490
uses: ./scripts/ci/actions/restore-artifacts
486-
if: ${{ env.ALGOLIA_APPLICATION_ID != '' }}
487491
with:
488-
type: languages
489-
languages: |
490-
swift
492+
type: specs
491493

492494
- name: Setup
493495
uses: ./.github/actions/setup
494496
if: ${{ env.ALGOLIA_APPLICATION_ID != '' }}
495497
with:
496-
type: minimal
497498
language: swift
498499
version: ${{ fromJSON(needs.setup.outputs.SWIFT_DATA).version }}
499500

501+
- name: Generate clients
502+
run: yarn cli generate swift ${{ fromJSON(needs.setup.outputs.SWIFT_DATA).toRun }}
503+
504+
- name: Generate tests
505+
run: yarn cli cts generate swift ${{ fromJSON(needs.setup.outputs.SWIFT_DATA).toRun }}
506+
500507
- name: Run tests on macOS
501508
id: run-test
502509
if: ${{ env.ALGOLIA_APPLICATION_ID != '' }}

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
22.11.0
1+
22.12.0

.yarn/releases/yarn-4.5.1.cjs renamed to .yarn/releases/yarn-4.5.3.cjs

Lines changed: 307 additions & 307 deletions
Large diffs are not rendered by default.

.yarnrc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ enableGlobalCache: false
44

55
nodeLinker: node-modules
66

7-
yarnPath: .yarn/releases/yarn-4.5.1.cjs
7+
yarnPath: .yarn/releases/yarn-4.5.3.cjs
88

99
# esbuild use native binaries, we need both to work locally and on the CI.
1010
supportedArchitectures:

clients/algoliasearch-client-csharp/CHANGELOG.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
## [7.11.0](https://github.com/algolia/algoliasearch-client-csharp/compare/7.10.0...7.11.0)
2+
3+
- [866d859f8](https://github.com/algolia/api-clients-automation/commit/866d859f8) fix(specs): different summaries for saveObject/addOrUpdate methods ([#4223](https://github.com/algolia/api-clients-automation/pull/4223)) by [@kai687](https://github.com/kai687/)
4+
- [baf16c689](https://github.com/algolia/api-clients-automation/commit/baf16c689) feat(specs): add `watch` to `pushTask` ingestion ([#4224](https://github.com/algolia/api-clients-automation/pull/4224)) by [@shortcuts](https://github.com/shortcuts/)
5+
6+
## [7.10.0](https://github.com/algolia/algoliasearch-client-csharp/compare/7.9.2...7.10.0)
7+
8+
- [068fdacb5](https://github.com/algolia/api-clients-automation/commit/068fdacb5) feat(specs): add info and link about indexing rate limits ([#4136](https://github.com/algolia/api-clients-automation/pull/4136)) by [@kai687](https://github.com/kai687/)
9+
- [9e0235697](https://github.com/algolia/api-clients-automation/commit/9e0235697) fix(specs): `nb_api_calls` in `getLogs` response is optional ([#4142](https://github.com/algolia/api-clients-automation/pull/4142)) by [@shortcuts](https://github.com/shortcuts/)
10+
- [b728c5f25](https://github.com/algolia/api-clients-automation/commit/b728c5f25) fix(specs): `consequence` is required when saving rules ([#4146](https://github.com/algolia/api-clients-automation/pull/4146)) by [@shortcuts](https://github.com/shortcuts/)
11+
- [afd94fac8](https://github.com/algolia/api-clients-automation/commit/afd94fac8) fix(specs): `saveRule` response type ([#4170](https://github.com/algolia/api-clients-automation/pull/4170)) by [@shortcuts](https://github.com/shortcuts/)
12+
- [2325c61b8](https://github.com/algolia/api-clients-automation/commit/2325c61b8) feat(clients): allow batch size on objects helper ([#4172](https://github.com/algolia/api-clients-automation/pull/4172)) by [@shortcuts](https://github.com/shortcuts/)
13+
- [aae74cb38](https://github.com/algolia/api-clients-automation/commit/aae74cb38) fix(specs): remove SFCC source type ([#4190](https://github.com/algolia/api-clients-automation/pull/4190)) by [@millotp](https://github.com/millotp/)
14+
- [254052857](https://github.com/algolia/api-clients-automation/commit/254052857) fix(specs): add sourceType to listTasks ([#4193](https://github.com/algolia/api-clients-automation/pull/4193)) by [@millotp](https://github.com/millotp/)
15+
- [106d64313](https://github.com/algolia/api-clients-automation/commit/106d64313) feat(generators): allow per-spec timeouts ([#4173](https://github.com/algolia/api-clients-automation/pull/4173)) by [@shortcuts](https://github.com/shortcuts/)
16+
- [9e1e60f9e](https://github.com/algolia/api-clients-automation/commit/9e1e60f9e) chore(deps): dependencies 2024-12-09 ([#4197](https://github.com/algolia/api-clients-automation/pull/4197)) by [@algolia-bot](https://github.com/algolia-bot/)
17+
118
## [7.9.2](https://github.com/algolia/algoliasearch-client-csharp/compare/7.9.1...7.9.2)
219

320
- [f246995a7](https://github.com/algolia/api-clients-automation/commit/f246995a7) chore(deps): dependencies 2024-11-18 ([#4109](https://github.com/algolia/api-clients-automation/pull/4109)) by [@algolia-bot](https://github.com/algolia-bot/)

clients/algoliasearch-client-csharp/algoliasearch/Algolia.Search.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<RepositoryUrl>https://github.com/algolia/algoliasearch-client-csharp</RepositoryUrl>
2121
<RepositoryType>git</RepositoryType>
2222
<RequireLicenseAcceptance>false</RequireLicenseAcceptance>
23-
<Version>7.9.2</Version>
23+
<Version>7.11.0</Version>
2424
<GenerateDocumentationFile>true</GenerateDocumentationFile>
2525
<TargetFrameworks>netstandard2.1;netstandard2.0</TargetFrameworks>
2626
<IncludeSymbols>true</IncludeSymbols>

clients/algoliasearch-client-csharp/algoliasearch/Clients/AbtestingConfiguration.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,13 @@ public sealed class AbtestingConfig : AlgoliaConfig
2828
/// <param name="appId">Your application ID</param>
2929
/// <param name="apiKey">Your API Key</param>
3030
/// <param name="region">Targeted region (optional)</param>
31-
public AbtestingConfig(string appId, string apiKey, string region = null) : base(appId, apiKey, "Abtesting", "7.9.2")
31+
public AbtestingConfig(string appId, string apiKey, string region = null) : base(appId, apiKey, "Abtesting", "7.11.0")
3232
{
3333
DefaultHosts = GetDefaultHosts(region);
3434
Compression = CompressionType.None;
35+
ReadTimeout = TimeSpan.FromSeconds(5);
36+
WriteTimeout = TimeSpan.FromSeconds(30);
37+
ConnectTimeout = TimeSpan.FromSeconds(2);
3538
}
3639
private static List<StatefulHost> GetDefaultHosts(string region)
3740
{

clients/algoliasearch-client-csharp/algoliasearch/Clients/AnalyticsConfiguration.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,13 @@ public sealed class AnalyticsConfig : AlgoliaConfig
2828
/// <param name="appId">Your application ID</param>
2929
/// <param name="apiKey">Your API Key</param>
3030
/// <param name="region">Targeted region (optional)</param>
31-
public AnalyticsConfig(string appId, string apiKey, string region = null) : base(appId, apiKey, "Analytics", "7.9.2")
31+
public AnalyticsConfig(string appId, string apiKey, string region = null) : base(appId, apiKey, "Analytics", "7.11.0")
3232
{
3333
DefaultHosts = GetDefaultHosts(region);
3434
Compression = CompressionType.None;
35+
ReadTimeout = TimeSpan.FromSeconds(5);
36+
WriteTimeout = TimeSpan.FromSeconds(30);
37+
ConnectTimeout = TimeSpan.FromSeconds(2);
3538
}
3639
private static List<StatefulHost> GetDefaultHosts(string region)
3740
{

0 commit comments

Comments
 (0)