Skip to content

Commit b736689

Browse files
MpdreamzMpdreamz
committed
Merge remote-tracking branch 'origin/main' into refactor/isolate-model-continued
2 parents 8eb5753 + f04de82 commit b736689

File tree

19 files changed

+140
-123
lines changed

19 files changed

+140
-123
lines changed

‎.github/dependabot.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,10 @@ updates:
2424
interval: 'weekly'
2525
day: 'monday'
2626
time: '08:00'
27+
groups:
28+
system-io-abstractions:
29+
patterns:
30+
- 'System.IO.Abstractions'
31+
- 'System.IO.Abstractions.*'
2732
labels:
2833
- chore

‎.github/workflows/preview-build.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -175,10 +175,6 @@ jobs:
175175
if: contains(fromJSON('["push", "workflow_dispatch"]'), github.event_name) && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master') && steps.s3-upload.outcome == 'success'
176176
uses: elastic/docs-builder/actions/update-link-index@main
177177

178-
- name: Update Reference Index
179-
if: contains(fromJSON('["push", "workflow_dispatch"]'), github.event_name) && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master') && steps.s3-upload.outcome == 'success'
180-
uses: elastic/docs-builder/actions/update-reference-index@main
181-
182178
- name: Update deployment status
183179
uses: actions/github-script@v7
184180
if: always() && steps.deployment.outputs.result

‎.github/workflows/preview-cleanup.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,3 @@ jobs:
5252
PR_NUMBER: ${{ github.event.pull_request.number }}
5353
run: |
5454
aws s3 rm "s3://elastic-docs-v3-website-preview/${GITHUB_REPOSITORY}/pull/${PR_NUMBER}" --recursive
55-
56-
- name: 'Update Reference Index'
57-
uses: elastic/docs-builder/actions/update-reference-index@main

‎.github/workflows/release.yml‎

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,16 @@ jobs:
6666
run: ./build.sh publishcontainers
6767

6868
release-lambda:
69+
environment:
70+
name: link-index-updater-prod
6971
runs-on: ubuntu-latest
7072
needs:
7173
- release-drafter
7274
permissions:
7375
contents: write
76+
id-token: write
77+
env:
78+
ZIP_FILE: link-index-updater-lambda.zip
7479
steps:
7580
- uses: actions/checkout@v4
7681
with:
@@ -81,13 +86,23 @@ jobs:
8186
- name: Get bootstrap binary
8287
run: |
8388
docker cp $(docker create --name tc publish-links-index:latest):/app/.artifacts/publish ./.artifacts && docker rm tc
84-
85-
# TODO publish to AWS
89+
90+
- uses: aws-actions/configure-aws-credentials@ececac1a45f3b08a01d2dd070d28d111c5fe6722 # v4.1.0
91+
with:
92+
role-to-assume: arn:aws:iam::197730964718:role/elastic-docs-v3-link-index-updater-deployer
93+
aws-region: us-east-2
94+
95+
- name: Upload Lambda function
96+
run: |
97+
zip -j "${ZIP_FILE}" .artifacts/docs-lambda-index-publisher/release_linux-x64/bootstrap
98+
aws lambda update-function-code \
99+
--function-name elastic-docs-v3-link-index-updater \
100+
--zip-file "fileb://${ZIP_FILE}"
101+
86102
- name: Attach Distribution to release
87103
env:
88104
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
89-
run: gh release upload ${{ needs.release-drafter.outputs.tag_name }} .artifacts/docs-lambda-index-publisher/release_linux-x64/bootstrap
90-
shell: bash
105+
run: gh release upload ${{ needs.release-drafter.outputs.tag_name }} "${ZIP_FILE}"
91106

92107
release:
93108
needs:
@@ -140,6 +155,8 @@ jobs:
140155
- release-lambda
141156
- release-drafter
142157
runs-on: ubuntu-latest
158+
permissions:
159+
contents: write
143160
steps:
144161
- name: Publish release
145162
env:

‎Directory.Packages.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<PackageVersion Include="Samboy063.Tomlet" Version="6.0.0" />
4242
<PackageVersion Include="Slugify.Core" Version="4.0.1" />
4343
<PackageVersion Include="SoftCircuits.IniFileParser" Version="2.7.0" />
44-
<PackageVersion Include="System.IO.Abstractions" Version="21.0.29" />
44+
<PackageVersion Include="System.IO.Abstractions" Version="22.0.14" />
4545
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.4" />
4646
<PackageVersion Include="Utf8StreamReader" Version="1.3.2" />
4747
<PackageVersion Include="Vecc.YamlDotNet.Analyzers.StaticGenerator" Version="16.1.3" PrivateAssets="All" />
@@ -57,7 +57,7 @@
5757
<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
5858
<PackageVersion Include="JetBrains.Annotations" Version="2024.3.0" />
5959
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
60-
<PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="21.0.29" />
60+
<PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="22.0.14" />
6161
<PackageVersion Include="Unquote" Version="7.0.1" />
6262
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
6363
<PackageVersion Include="xunit.v3" Version="1.1.0" />

‎actions/update-reference-index/action.yml‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎docs-builder.sln‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "update-link-index", "update
6767
actions\update-link-index\README.md = actions\update-link-index\README.md
6868
EndProjectSection
6969
EndProject
70-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "update-reference-index", "update-reference-index", "{9FEC15F6-13F8-40B1-A66A-EB054E49E680}"
71-
ProjectSection(SolutionItems) = preProject
72-
actions\update-reference-index\action.yml = actions\update-reference-index\action.yml
73-
EndProjectSection
74-
EndProject
7570
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "docs-lambda-index-publisher", "src\infra\docs-lambda-index-publisher\docs-lambda-index-publisher.csproj", "{C559D52D-100B-4B2B-BE87-2344D835761D}"
7671
EndProject
7772
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "docs-assembler.Tests", "tests\docs-assembler.Tests\src\docs-assembler.Tests\docs-assembler.Tests.csproj", "{CDC0ECF4-6597-4FBA-8D25-5C244F0877E3}"
@@ -162,7 +157,6 @@ Global
162157
{4CCE599A-B9FE-4DF2-8763-34CF0A99D4AA} = {BE6011CC-1200-4957-B01F-FCCA10C5CF5A}
163158
{6E2ED6CC-AFC1-4E58-965D-6AEC500EBB46} = {245023D2-D3CA-47B9-831D-DAB91A2FFDC7}
164159
{6554F917-73CE-4B3D-9101-F28EAA762C6B} = {245023D2-D3CA-47B9-831D-DAB91A2FFDC7}
165-
{9FEC15F6-13F8-40B1-A66A-EB054E49E680} = {245023D2-D3CA-47B9-831D-DAB91A2FFDC7}
166160
{CDC0ECF4-6597-4FBA-8D25-5C244F0877E3} = {67B576EE-02FA-4F9B-94BC-3630BC09ECE5}
167161
{4894063D-0DEF-4B7E-97D0-0D0A5B85C608} = {BE6011CC-1200-4957-B01F-FCCA10C5CF5A}
168162
{C559D52D-100B-4B2B-BE87-2344D835761D} = {4894063D-0DEF-4B7E-97D0-0D0A5B85C608}

‎src/Elastic.Markdown/Assets/markdown/code.css‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
background-color: #22272e;
1111
mix-blend-mode: unset;
1212
line-height: 1.5em;
13+
word-break: normal;
1314
}
1415
code:first-child {
1516
@apply rounded-t-sm;
@@ -63,6 +64,7 @@
6364
text-decoration: inherit;
6465
font-weight: inherit;
6566
mix-blend-mode: multiply;
67+
word-break: break-word;
6668
}
6769

6870
.hljs-built_in,

‎src/Elastic.Markdown/Assets/styles.css‎

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
--banner-height: calc(var(--spacing) * 9);
2525
/*--offset-top: calc(var(--header-height) + var(--banner-height));*/
2626
--offset-top: 72px;
27+
--max-layout-width: 1920px;
2728
}
2829

2930
@media screen and (min-width: 767px) {
@@ -97,10 +98,6 @@
9798
}
9899
}
99100

100-
.content-container {
101-
@apply w-full max-w-[80ch];
102-
}
103-
104101
.applies {
105102
@apply font-sans;
106103
border-bottom: 1px solid var(--color-grey-20);
@@ -233,12 +230,31 @@
233230

234231
.container {
235232
@apply lg:px-3;
236-
237233
max-width: 1250px !important;
238234
}
239235

240236
#elastic-nav {
241237
min-height: var(--offset-top);
238+
239+
@media screen and (min-width: 1200px) {
240+
.oldNav {
241+
& > div {
242+
width: 100%;
243+
max-width: var(--max-layout-width);
244+
}
245+
div:has(> div > nav) {
246+
flex-grow: 1;
247+
justify-content: center;
248+
}
249+
}
250+
}
251+
@media screen and (min-width: 1536px) {
252+
.oldNav {
253+
nav {
254+
margin-left: -74px;
255+
}
256+
}
257+
}
242258
}
243259

244260
body {

‎src/Elastic.Markdown/Assets/theme.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
--breakpoint-sm: 640px;
33
--breakpoint-md: 768px;
44
--breakpoint-lg: 1280px;
5-
--breakpoint-xl: 1920px;
6-
--breakpoint-2xl: 2000px;
5+
--breakpoint-xl: 1536px;
6+
--breakpoint-2xl: 1920px;
77

88
--font-sans:
99
'Mier B', 'Inter', ui-sans-serif, system-ui, sans-serif,

0 commit comments

Comments
 (0)