Skip to content

Commit fbd6b5d

Browse files
authored
Merge branch 'main' into feat/add-chopper-requester-package
2 parents 2607674 + f0afd35 commit fbd6b5d

File tree

1,880 files changed

+26271
-19517
lines changed

Some content is hidden

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

1,880 files changed

+26271
-19517
lines changed

.github/actions/setup/action.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ runs:
1919
# Java for code generation
2020
- name: Install Java
2121
if: inputs.type != 'minimal'
22-
uses: actions/setup-java@v4.5.0
22+
uses: actions/setup-java@v4.6.0
2323
with:
2424
distribution: zulu
2525
java-version-file: config/.java-version
@@ -47,10 +47,6 @@ runs:
4747
shell: bash
4848
run: YARN_ENABLE_HARDENED_MODE=0 YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install
4949

50-
- name: Build scripts
51-
shell: bash
52-
run: yarn workspace scripts build:cli
53-
5450
# JavaScript client deps
5551
- name: Get yarn js-client cache directory path
5652
if: ${{ inputs.language == 'javascript' }}
@@ -139,7 +135,7 @@ runs:
139135
- name: Install poetry
140136
if: ${{ inputs.language == 'python' }}
141137
shell: bash
142-
run: pipx install poetry
138+
run: pipx install poetry==2
143139

144140
- uses: actions/setup-python@v5
145141
if: ${{ inputs.language == 'python' }}

.github/workflows/check.yml

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,8 @@ jobs:
319319
ALGOLIA_APPLICATION_ID: ${{ secrets.ALGOLIA_APPLICATION_ID }}
320320
ALGOLIA_ADMIN_KEY: ${{ secrets.ALGOLIA_ADMIN_KEY }}
321321
MONITORING_API_KEY: ${{ secrets.MONITORING_API_KEY }}
322+
outputs:
323+
hasBreakingChanges: ${{ steps.breakingChanges.outputs.hasBreakingChanges }}
322324
name: client ${{ matrix.client.language }}@${{ matrix.client.version }}
323325
steps:
324326
- uses: actions/checkout@v4
@@ -355,7 +357,8 @@ jobs:
355357
run: yarn cli build playground ${{ matrix.client.language }}
356358

357359
- name: Run Java 'algoliasearch' public API validation
358-
if: ${{ github.base_ref == 'main' && matrix.client.language == 'java' && matrix.client.isMainVersion && !contains(format('{0} {1}', github.event.pull_request.title, github.event.head_commit.message), '[skip-bc]') }}
360+
id: breakingChanges
361+
if: ${{ github.base_ref == 'main' && matrix.client.language == 'java' && matrix.client.isMainVersion }}
359362
run: |
360363
cd ${{ matrix.client.path }}
361364
exit_code=0
@@ -367,7 +370,9 @@ jobs:
367370
cat $FILE
368371
fi
369372
370-
exit $exit_code
373+
if [[ $exit_code -ne 0 ]]; then
374+
echo "hasBreakingChanges=true" >> $GITHUB_OUTPUT
375+
fi
371376
372377
- name: Remove previous CTS output
373378
run: rm -rf ${{ matrix.client.testsToDelete }} || true
@@ -431,7 +436,7 @@ jobs:
431436
!contains(needs.*.result, 'failure')
432437
outputs:
433438
success: ${{ steps.setoutput.outputs.success }}
434-
name: client kotlin${{ needs.setup.outputs.RUN_MACOS_KOTLIN_BUILD == 'true' && format('@{0}', fromJSON(needs.setup.outputs.KOTLIN_DATA).version) || '' }} macos
439+
name: client kotlin${{ format('@{0}', fromJSON(needs.setup.outputs.KOTLIN_DATA).version) }} macos
435440
steps:
436441
- uses: actions/checkout@v4
437442

@@ -481,7 +486,7 @@ jobs:
481486
MONITORING_API_KEY: ${{ secrets.MONITORING_API_KEY }}
482487
outputs:
483488
success: ${{ steps.setoutput.outputs.success }}
484-
name: client swift${{ needs.setup.outputs.RUN_MACOS_SWIFT_CTS == 'true' && format('@{0}', fromJSON(needs.setup.outputs.SWIFT_DATA).version) || '' }} macos
489+
name: client swift${{ format('@{0}', fromJSON(needs.setup.outputs.SWIFT_DATA).version) }} macos
485490
steps:
486491
- uses: actions/checkout@v4
487492
if: ${{ env.ALGOLIA_APPLICATION_ID != '' }}
@@ -586,12 +591,25 @@ jobs:
586591
GITHUB_TOKEN: ${{ secrets.ALGOLIA_BOT_TOKEN != '' && secrets.ALGOLIA_BOT_TOKEN || secrets.GITHUB_TOKEN }}
587592
PR_NUMBER: ${{ github.event.number }}
588593

594+
- name: Check for breaking changes
595+
id: breakingChanges
596+
if: ${{ needs.client_gen.outputs.hasBreakingChanges == 'true' }}
597+
run: |
598+
{
599+
echo 'BREAKING_CHANGES_SECTION<<EOF'
600+
echo "# 💥 Breaking changes detected !!"
601+
echo "Either this PR or a previous PR not released yet introduced breaking changes, be careful when merging."
602+
echo "You can find the details in the 'client java@17' CI job."
603+
echo 'EOF'
604+
} >> "$GITHUB_OUTPUT"
605+
589606
- name: update generation comment
590607
uses: marocchino/sticky-pull-request-comment@v2
591608
if: ${{ steps.pushGeneratedCode.outputs.GENERATED_COMMIT == '' }}
592609
with:
593610
GITHUB_TOKEN: ${{ secrets.ALGOLIA_BOT_TOKEN != '' && secrets.ALGOLIA_BOT_TOKEN || secrets.GITHUB_TOKEN }}
594611
message: |
612+
${{ steps.breakingChanges.outputs.BREAKING_CHANGES_SECTION }}
595613
### No code generated
596614
597615
_If you believe code should've been generated, please, [report the issue](https://github.com/algolia/api-clients-automation/issues/new?assignees=&labels=bug%2Ctriage&projects=&template=Bug_report.yml&title=%5Bbug%5D%3A+)._
@@ -604,6 +622,7 @@ jobs:
604622
with:
605623
GITHUB_TOKEN: ${{ secrets.ALGOLIA_BOT_TOKEN != '' && secrets.ALGOLIA_BOT_TOKEN || secrets.GITHUB_TOKEN }}
606624
message: |
625+
${{ steps.breakingChanges.outputs.BREAKING_CHANGES_SECTION }}
607626
### ✔️ Code generated!
608627
609628
| Name | Link |

.nvmrc

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

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

Lines changed: 287 additions & 287 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.3.cjs
7+
yarnPath: .yarn/releases/yarn-4.6.0.cjs
88

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

clients/algoliasearch-client-csharp/.github/ISSUE_TEMPLATE/Bug_report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ body:
2727
id: client
2828
attributes:
2929
label: Client
30-
description: Which API are you targetting?
30+
description: Which API are you targeting?
3131
options:
3232
- All
3333
- AB testing

clients/algoliasearch-client-csharp/CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
## [7.12.0](https://github.com/algolia/algoliasearch-client-csharp/compare/7.11.2...7.12.0)
2+
3+
- [b569646304](https://github.com/algolia/api-clients-automation/commit/b569646304) fix(specs): drop singer from ingestion specs ([#4281](https://github.com/algolia/api-clients-automation/pull/4281)) by [@shortcuts](https://github.com/shortcuts/)
4+
- [37223c9779](https://github.com/algolia/api-clients-automation/commit/37223c9779) feat(clients): cleanup after replaceAllObjects failure ([#3824](https://github.com/algolia/api-clients-automation/pull/3824)) by [@millotp](https://github.com/millotp/)
5+
- [47b567fd0d](https://github.com/algolia/api-clients-automation/commit/47b567fd0d) chore(deps): dependencies 2025-01-06 ([#4299](https://github.com/algolia/api-clients-automation/pull/4299)) by [@algolia-bot](https://github.com/algolia-bot/)
6+
- [5328ce8333](https://github.com/algolia/api-clients-automation/commit/5328ce8333) feat(specs): add notification settings to tasks ([#4297](https://github.com/algolia/api-clients-automation/pull/4297)) by [@millotp](https://github.com/millotp/)
7+
- [e7b3898f06](https://github.com/algolia/api-clients-automation/commit/e7b3898f06) feat(clients): add optionnal scopes to replaceAllObjects ([#4296](https://github.com/algolia/api-clients-automation/pull/4296)) by [@millotp](https://github.com/millotp/)
8+
- [47193ad3d1](https://github.com/algolia/api-clients-automation/commit/47193ad3d1) chore: revert release ([#4314](https://github.com/algolia/api-clients-automation/pull/4314)) by [@shortcuts](https://github.com/shortcuts/)
9+
- [9e05bf278d](https://github.com/algolia/api-clients-automation/commit/9e05bf278d) fix(csharp): update deps to allow a range ([#4316](https://github.com/algolia/api-clients-automation/pull/4316)) by [@morganleroi](https://github.com/morganleroi/)
10+
111
## [7.11.2](https://github.com/algolia/algoliasearch-client-csharp/compare/7.11.1...7.11.2)
212

313
- [0481473fe0](https://github.com/algolia/api-clients-automation/commit/0481473fe0) chore: trigger auto close pr ([#4250](https://github.com/algolia/api-clients-automation/pull/4250)) by [@shortcuts](https://github.com/shortcuts/)

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

Lines changed: 4 additions & 4 deletions
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.11.2</Version>
23+
<Version>7.12.0</Version>
2424
<GenerateDocumentationFile>true</GenerateDocumentationFile>
2525
<TargetFrameworks>netstandard2.1;netstandard2.0</TargetFrameworks>
2626
<IncludeSymbols>true</IncludeSymbols>
@@ -37,9 +37,9 @@
3737
</PropertyGroup>
3838

3939
<ItemGroup>
40-
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
41-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
42-
<PackageReference Include="System.Text.Json" Version="9.0.0" />
40+
<PackageReference Include="Microsoft.Extensions.Logging" Version="[8.0.0, 10.0.0)" />
41+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[8.0.0, 10.0.0)" />
42+
<PackageReference Include="System.Text.Json" Version="[8.0.0, 10.0.0)" />
4343
</ItemGroup>
4444

4545
<ItemGroup>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +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.11.2")
31+
public AbtestingConfig(string appId, string apiKey, string region = null) : base(appId, apiKey, "Abtesting", "7.12.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);
35+
ReadTimeout = TimeSpan.FromMilliseconds(5000);
36+
WriteTimeout = TimeSpan.FromMilliseconds(30000);
37+
ConnectTimeout = TimeSpan.FromMilliseconds(2000);
3838
}
3939
private static List<StatefulHost> GetDefaultHosts(string region)
4040
{

0 commit comments

Comments
 (0)