Skip to content

Commit 8873f99

Browse files
committed
Merge branch 'main' of github.com:elastic/docs-builder into add-migration-guide
# Conflicts: # docs/source/index.md
2 parents deb3bef + 3311063 commit 8873f99

File tree

184 files changed

+6406
-1856
lines changed

Some content is hidden

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

184 files changed

+6406
-1856
lines changed

.editorconfig

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ indent_size = 4
77
# Spell checker configuration
88
spelling_exclusion_path = "./build/exclusion.dic"
99

10+
[*.{fs,fsx,cs,vb}]
11+
file_header_template=Licensed to Elasticsearch B.V under one or more agreements.\nElasticsearch B.V licenses this file to you under the Apache 2.0 License.\nSee the LICENSE file in the project root for more information
12+
1013
[*.{fs,fsx}]
1114
indent_style = space
1215
indent_size = 4
@@ -133,12 +136,12 @@ csharp_style_var_for_built_in_types = true:error
133136
csharp_style_var_when_type_is_apparent = true:error
134137
csharp_style_var_elsewhere = true:error
135138

136-
csharp_style_expression_bodied_methods = true:warning
137-
csharp_style_expression_bodied_constructors = true:warning
138-
csharp_style_expression_bodied_operators = true:warning
139-
csharp_style_expression_bodied_properties = true:warning
140-
csharp_style_expression_bodied_indexers = true:warning
141-
csharp_style_expression_bodied_accessors = true:warning
139+
csharp_style_expression_bodied_methods = true:suggestion
140+
csharp_style_expression_bodied_constructors = true:suggestion
141+
csharp_style_expression_bodied_operators = true:suggestion
142+
csharp_style_expression_bodied_properties = true:suggestion
143+
csharp_style_expression_bodied_indexers = true:suggestion
144+
csharp_style_expression_bodied_accessors = true:suggestion
142145

143146
# Suggest more modern language features when available
144147
csharp_style_pattern_matching_over_is_with_cast_check = true:error

.github/check-license-headers.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@ if [[ $nErrors -eq 0 ]]; then
4242
exit 0
4343
else
4444
exit 1
45-
fi
45+
fi

.github/workflows/ci.yml

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,13 @@ permissions:
1212
packages: write
1313

1414
env:
15-
NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages
16-
IMAGE_NAME: elastic/docs-builder
1715
BASE_IMAGE: mcr.microsoft.com/dotnet/nightly/runtime-deps:8.0-jammy-chiseled-aot
16+
BASE_IMAGE_SINGLE: mcr.microsoft.com/dotnet/nightly/runtime-deps:8.0-jammy-chiseled
1817
DOCKER_TAG: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags') && 'latest;edge' || 'edge' }}
1918

2019
jobs:
2120
deploy:
2221
runs-on: ubuntu-latest
23-
if: false
2422
permissions:
2523
pages: write
2624
id-token: write
@@ -33,14 +31,16 @@ jobs:
3331
name: github-pages
3432
url: ${{steps.deployment.outputs.page_url}}
3533
steps:
34+
- id: repo-basename
35+
run: 'echo "value=`basename ${{ github.repository }}`" >> $GITHUB_OUTPUT'
3636
- uses: actions/checkout@v4
3737
- name: Setup Pages
3838
id: pages
3939
uses: actions/[email protected]
4040
- name: Build documentation
4141
uses: elastic/docs-builder@main
4242
with:
43-
prefix: "docs-builder"
43+
prefix: '${{ steps.repo-basename.outputs.value }}'
4444
- name: Upload artifact
4545
uses: actions/[email protected]
4646
with:
@@ -70,7 +70,7 @@ jobs:
7070
username: ${{ github.actor }}
7171
password: ${{ secrets.GITHUB_TOKEN }}
7272

73-
- name: Publish app
73+
- name: Publish docs-builder
7474
run: |
7575
dotnet publish "src/docs-builder/docs-builder.csproj" \
7676
/t:PublishContainer \
@@ -79,4 +79,15 @@ jobs:
7979
-p ContainerBaseImage=${{ env.BASE_IMAGE }} \
8080
-p ContainerRegistry=ghcr.io \
8181
-p ContainerImageTags='"${{ env.DOCKER_TAG }};${{ steps.bootstrap.outputs.full-version }}"' \
82-
-p ContainerRepository=${{ env.IMAGE_NAME }} \
82+
-p ContainerRepository=${{ github.repository }}
83+
84+
- name: Publish docs-generator
85+
run: |
86+
dotnet publish "src/docs-generator/docs-generator.csproj" \
87+
/t:PublishContainer \
88+
-p DebugType=none \
89+
-p ContainerUser=1001:1001 \
90+
-p ContainerBaseImage=${{ env.BASE_IMAGE_SINGLE }} \
91+
-p ContainerRegistry=ghcr.io \
92+
-p ContainerImageTags='"${{ env.DOCKER_TAG }};${{ steps.bootstrap.outputs.full-version }}"' \
93+
-p ContainerRepository=elastic/docs-generator \

.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,6 @@ DocProject/Help/*.hhp
180180
DocProject/Help/Html2
181181
DocProject/Help/html
182182

183-
# Click-Once directory
184-
publish/
185-
186183
# Publish Web Output
187184
*.[Pp]ublish.xml
188185
*.azurePubxml

0 commit comments

Comments
 (0)