Skip to content

Commit c669c03

Browse files
authored
Merge branch 'main' into add-weighted-rrf-retriever-types
2 parents 8776033 + c887822 commit c669c03

File tree

111 files changed

+964
-298
lines changed

Some content is hidden

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

111 files changed

+964
-298
lines changed

.github/workflows/update-rest-api-json.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,5 @@ jobs:
5050
commit-message: 'Update rest-api-spec'
5151
labels: specification,skip-backport
5252
delete-branch: true
53-
reviewers: Anaethelion,ezimuel,flobernd,JoshMock,l-trotta,miguelgrinberg,picandocodigo,pquentin,swallez,technige
53+
reviewers: Anaethelion,ezimuel,flobernd,JoshMock,l-trotta,miguelgrinberg,picandocodigo,pquentin,technige
5454
branch: automated/rest-api-spec-update-${{ matrix.branch }}

.github/workflows/validate-apis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,6 @@ jobs:
9393
with:
9494
path: ./clients-flight-recorder/recordings/types-validation/types-validation.json
9595
key: types-validation-json-${{ format('{0}-{1}', github.ref_name, github.sha) }}
96-
restore-keys: |
97-
types-validation-json-${{ github.ref_name }}-
9896

9997
- name: Run validation (PR)
10098
if: github.event_name == 'pull_request'

compiler/.prettierrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
"singleQuote": true,
77
"quoteProps": "as-needed",
88
"bracketSpacing": true,
9-
"endOfLine": "lf",
9+
"endOfLine": "auto",
1010
"bracketSameLine": true
1111
}

compiler/src/model/build-model.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,6 @@ export function compileEndpoints (): Record<string, model.Endpoint> {
102102
}
103103
})
104104
}
105-
106-
// temporary workaround for APIs that are serverless-only
107-
// until we can stop depending on rest-api-spec for availability
108-
if (api === 'project.tags') {
109-
delete map[api].availability.stack
110-
}
111-
112105
if (typeof spec.feature_flag === 'string') {
113106
map[api].availability.stack = { featureFlag: spec.feature_flag }
114107
}

output/openapi/elasticsearch-openapi.json

Lines changed: 151 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

output/openapi/elasticsearch-serverless-openapi.json

Lines changed: 69 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)