Skip to content

Commit 95669ad

Browse files
committed
Merge branch 'main' into docs/abtests/api-v3
2 parents a901589 + 2338f20 commit 95669ad

File tree

2,295 files changed

+179753
-50185
lines changed

Some content is hidden

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

2,295 files changed

+179753
-50185
lines changed

.eslintrc.cjs

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ module.exports = {
5454
'automation-custom/no-big-int': 'error',
5555
'automation-custom/no-final-dot': 'error',
5656
'automation-custom/single-quote-ref': 'error',
57+
'automation-custom/has-type': 'error',
5758
},
5859
overrides: [
5960
{

.github/actions/setup/action.yml

+57-52
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.6.0
22+
uses: actions/setup-java@v4.7.1
2323
with:
2424
distribution: zulu
2525
java-version-file: config/.java-version
@@ -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.25.2/google-java-format-1.25.2-all-deps.jar" > /tmp/java-formatter.jar
37+
run: curl --retry 3 -L "https://github.com/google/google-java-format/releases/download/v1.26.0/google-java-format-1.26.0-all-deps.jar" > /tmp/java-formatter.jar
3838

3939
# JavaScript for monorepo and tooling
4040
- name: Install Node
@@ -47,46 +47,24 @@ runs:
4747
shell: bash
4848
run: YARN_ENABLE_HARDENED_MODE=0 YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install
4949

50-
# JavaScript client deps
51-
- name: Get yarn js-client cache directory path
52-
if: ${{ inputs.language == 'javascript' }}
53-
shell: bash
54-
id: yarn-cache-dir-client
55-
run: echo "dir=$(cd clients/algoliasearch-client-javascript && yarn config get cacheFolder)" >> $GITHUB_OUTPUT
56-
57-
- name: Restore Yarn js-client
58-
if: ${{ inputs.language == 'javascript' }}
59-
uses: actions/cache@v4
60-
with:
61-
path: ${{ steps.yarn-cache-dir-client.outputs.dir || 'clients/algoliasearch-client-javascript/.yarn/cache' }}
62-
key: yarn-cache-clients-${{ hashFiles('clients/algoliasearch-client-javascript/yarn.lock') }}
63-
64-
- name: Cache js-client node modules
65-
if: ${{ inputs.language == 'javascript' }}
66-
uses: actions/cache@v4
50+
# Csharp
51+
- name: Install dotnet
52+
if: ${{ inputs.language == 'csharp' }}
53+
uses: actions/setup-dotnet@v4
6754
with:
68-
path: clients/algoliasearch-client-javascript/node_modules
69-
key: node-modules-clients-${{ hashFiles('clients/algoliasearch-client-javascript/yarn.lock') }}
70-
71-
- name: Install JavaScript client dependencies
72-
if: ${{ inputs.language == 'javascript' }}
73-
shell: bash
74-
run: cd clients/algoliasearch-client-javascript && YARN_ENABLE_HARDENED_MODE=0 YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install
55+
dotnet-version: ${{ inputs.version }}
7556

76-
# PHP
77-
- name: Install PHP
78-
if: ${{ inputs.language == 'php' }}
79-
uses: shivammathur/setup-php@v2
57+
# Dart
58+
- name: Install dart
59+
if: ${{ inputs.language == 'dart' }}
60+
uses: dart-lang/setup-dart@v1
8061
with:
81-
php-version: ${{ inputs.version }}
82-
tools: composer
62+
sdk: ${{ inputs.version }}
8363

84-
- name: Run composer install
85-
if: ${{ inputs.language == 'php' }}
64+
- name: Setup dart tools
65+
if: ${{ inputs.language == 'dart' }}
8666
shell: bash
87-
run: |
88-
composer install --working-dir=clients/algoliasearch-client-php
89-
composer dump-autoload --working-dir=clients/algoliasearch-client-php
67+
run: dart pub global activate melos
9068

9169
# Golang
9270
- name: Install golang
@@ -111,6 +89,32 @@ runs:
11189
path: ~/.cache/golangci-lint
11290
key: golangci-lint-${{ inputs.version }}-${{ hashFiles('clients/algoliasearch-client-go/go.sum') }}
11391

92+
# JavaScript client deps
93+
- name: Get yarn js-client cache directory path
94+
if: ${{ inputs.language == 'javascript' }}
95+
shell: bash
96+
id: yarn-cache-dir-client
97+
run: echo "dir=$(cd clients/algoliasearch-client-javascript && yarn config get cacheFolder)" >> $GITHUB_OUTPUT
98+
99+
- name: Restore Yarn js-client
100+
if: ${{ inputs.language == 'javascript' }}
101+
uses: actions/cache@v4
102+
with:
103+
path: ${{ steps.yarn-cache-dir-client.outputs.dir || 'clients/algoliasearch-client-javascript/.yarn/cache' }}
104+
key: yarn-cache-clients-${{ hashFiles('clients/algoliasearch-client-javascript/yarn.lock') }}
105+
106+
- name: Cache js-client node modules
107+
if: ${{ inputs.language == 'javascript' }}
108+
uses: actions/cache@v4
109+
with:
110+
path: clients/algoliasearch-client-javascript/node_modules
111+
key: node-modules-clients-${{ hashFiles('clients/algoliasearch-client-javascript/yarn.lock') }}
112+
113+
- name: Install JavaScript client dependencies
114+
if: ${{ inputs.language == 'javascript' }}
115+
shell: bash
116+
run: cd clients/algoliasearch-client-javascript && YARN_ENABLE_HARDENED_MODE=0 YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install
117+
114118
# Kotlin
115119
- name: Cache spotless
116120
if: ${{ inputs.language == 'kotlin' }}
@@ -119,17 +123,20 @@ runs:
119123
path: clients/algoliasearch-client-kotlin/client/build/spotless
120124
key: spotless-${{ hashFiles('clients/algoliasearch-client-kotlin/build.gradle.kts') }}
121125

122-
# Dart
123-
- name: Install dart
124-
if: ${{ inputs.language == 'dart' }}
125-
uses: dart-lang/setup-dart@v1
126+
# PHP
127+
- name: Install PHP
128+
if: ${{ inputs.language == 'php' }}
129+
uses: shivammathur/setup-php@v2
126130
with:
127-
sdk: ${{ inputs.version }}
131+
php-version: ${{ inputs.version }}
132+
tools: composer
128133

129-
- name: Setup dart tools
130-
if: ${{ inputs.language == 'dart' }}
134+
- name: Run composer install
135+
if: ${{ inputs.language == 'php' }}
131136
shell: bash
132-
run: dart pub global activate melos
137+
run: |
138+
composer install --working-dir=clients/algoliasearch-client-php
139+
composer dump-autoload --working-dir=clients/algoliasearch-client-php
133140
134141
# Python
135142
- name: Install poetry
@@ -165,12 +172,10 @@ runs:
165172
mv tmp/releases/v0.10.0-Linux/rubyfmt /usr/local/bin
166173
rm -rf rubyfmt.tar.gz tmp
167174
168-
# Csharp
169-
- name: Install dotnet
170-
if: ${{ inputs.language == 'csharp' }}
171-
uses: actions/setup-dotnet@v4
172-
with:
173-
dotnet-version: ${{ inputs.version }}
175+
# Scala
176+
- name: Install sbt
177+
if: ${{ inputs.language == 'scala' }}
178+
uses: sbt/setup-sbt@v1
174179

175180
# Swift deps
176181
- name: Install swift
@@ -197,7 +202,7 @@ runs:
197202
if: ${{ inputs.language == 'swift' }}
198203
id: swiftformat-version
199204
shell: bash
200-
run: echo "SWIFTFORMAT_VERSION=0.54.5" >> $GITHUB_OUTPUT
205+
run: echo "SWIFTFORMAT_VERSION=0.55.5" >> $GITHUB_OUTPUT
201206

202207
- name: Checkout swiftformat
203208
if: ${{ inputs.language == 'swift' }}

0 commit comments

Comments
 (0)