Skip to content

Commit a9ed8b1

Browse files
authored
Revert "Reapply #1708 Add ElasticsearchGateway and UI adjustments" (#1731)" (#1785)
This reverts commit d84c676.
1 parent d84c676 commit a9ed8b1

File tree

21 files changed

+148
-676
lines changed

21 files changed

+148
-676
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -94,17 +94,7 @@ jobs:
9494
run: dotnet run --project build -c release -- unit-test
9595

9696
- name: Publish AOT
97-
if: ${{ matrix.os != 'ubuntu-latest' }} # publish containers already validates AOT build
9897
run: dotnet run --project build -c release -- publishbinaries
99-
100-
- name: Publish Containers
101-
if: ${{ matrix.os == 'ubuntu-latest' }}
102-
run: dotnet run --project build -c release -- publishcontainers
103-
104-
- name: Run Container
105-
if: ${{ matrix.os == 'ubuntu-latest' }}
106-
run: docker run elastic/docs-builder:ci-${{ github.event.pull_request.number }} --help
107-
10898

10999
integration:
110100
runs-on: docs-builder-latest-16

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
password: ${{ secrets.GITHUB_TOKEN }}
6868

6969
- name: Publish Containers
70-
run: ./build.sh publishcontainers
70+
run: ./build.sh publishcontainers\
7171

7272
build-lambda:
7373
needs:

Directory.Packages.props

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,8 @@
2323
<PackageVersion Include="AWSSDK.SQS" Version="4.0.0.1" />
2424
<PackageVersion Include="AWSSDK.S3" Version="4.0.0.1" />
2525
<PackageVersion Include="Elastic.Aspire.Hosting.Elasticsearch" Version="9.3.0" />
26-
<PackageVersion Include="Elastic.Clients.Elasticsearch" Version="9.1.4" />
2726
<PackageVersion Include="FakeItEasy" Version="8.3.0" />
28-
<PackageVersion Include="Elastic.Ingest.Elasticsearch" Version="0.14.0" />
27+
<PackageVersion Include="Elastic.Ingest.Elasticsearch" Version="0.11.3" />
2928
<PackageVersion Include="InMemoryLogger" Version="1.0.66" />
3029
<PackageVersion Include="MartinCostello.Logging.XUnit.v3" Version="0.6.0" />
3130
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.4" />

build/Targets.fs

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -77,40 +77,32 @@ let private publishZip _ =
7777
let private publishContainers _ =
7878

7979
let createImage project =
80-
let ci = Environment.environVarOrNone "GITHUB_ACTIONS"
81-
let pr =
82-
match Environment.environVarOrNone "GITHUB_REF_NAME" with
83-
| None -> None
84-
| Some s when s.EndsWith "/merge" -> Some (s.Split('/') |> Seq.head)
85-
| _ -> None
8680
let imageTag =
8781
match project with
88-
| _ -> "9.0-noble-chiseled-aot"
82+
| "docs-builder" -> "jammy-chiseled-aot"
83+
| _ -> "jammy-chiseled-aot"
8984
let labels =
9085
let exitCode = exec {
9186
validExitCode (fun _ -> true)
9287
exit_code_of "git" "describe" "--tags" "--exact-match" "HEAD"
9388
}
94-
match (exitCode, pr) with
95-
| 0, _ -> "edge;latest"
96-
| _, None -> "edge"
97-
| _, Some pr -> $"ci-%s{pr}"
89+
match exitCode with | 0 -> "edge;latest" | _ -> "edge"
9890
let args =
9991
["publish"; $"src/tooling/%s{project}/%s{project}.csproj"]
10092
@ [
10193
"/t:PublishContainer";
10294
"-p"; "DebugType=none";
103-
"-p"; $"ContainerBaseImage=mcr.microsoft.com/dotnet/nightly/runtime-deps:%s{imageTag}";
95+
"-p"; $"ContainerBaseImage=mcr.microsoft.com/dotnet/nightly/runtime-deps:8.0-%s{imageTag}";
10496
"-p"; $"ContainerImageTags=\"%s{labels};%s{Software.Version.Normalize()}\""
10597
"-p"; $"ContainerRepository=elastic/%s{project}"
10698
]
10799
let registry =
108-
match (ci, pr) with
109-
| Some _, None -> [
110-
"-p"; "ContainerRegistry=ghcr.io"
111-
"-p"; "ContainerUser=1001:1001";
112-
]
113-
| _, _ -> []
100+
match Environment.environVarOrNone "GITHUB_ACTIONS" with
101+
| None -> []
102+
| Some _ -> [
103+
"-p"; "ContainerRegistry=ghcr.io"
104+
"-p"; "ContainerUser=1001:1001";
105+
]
114106
exec { run "dotnet" (args @ registry) }
115107
createImage "docs-builder"
116108
createImage "docs-assembler"

src/Elastic.Documentation.Site/Assets/web-components/SearchOrAskAi/AskAi/AskAiSuggestions.tsx

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
import { useSearchActions, useSearchTerm } from '../search.store'
2-
import {
3-
EuiButton,
4-
EuiIcon,
5-
EuiSpacer,
6-
EuiText,
7-
useEuiTheme,
8-
} from '@elastic/eui'
2+
import { EuiButton, EuiSpacer, EuiText, useEuiTheme } from '@elastic/eui'
93
import { css } from '@emotion/react'
104
import * as React from 'react'
115

@@ -32,16 +26,7 @@ export const AskAiSuggestions = (props: Props) => {
3226
`
3327
return (
3428
<>
35-
<div
36-
css={css`
37-
display: flex;
38-
gap: ${euiTheme.size.s};
39-
align-items: center;
40-
`}
41-
>
42-
<EuiIcon type="sparkles" color="subdued" size="s" />
43-
<EuiText size="xs">Ask Elastic Docs AI Assistant</EuiText>
44-
</div>
29+
<EuiText size="xs">Ask Elastic Docs AI Assistant</EuiText>
4530
<EuiSpacer size="s" />
4631
{searchTerm && (
4732
<EuiButton

0 commit comments

Comments
 (0)