Skip to content

Commit 171392a

Browse files
authored
Merge branch 'main' into feature/cleanup-otel
2 parents 7681f14 + 1ca6ce5 commit 171392a

File tree

5 files changed

+16
-33
lines changed

5 files changed

+16
-33
lines changed

actions/assembler-config-validate/action.yml

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

actions/assembler-match/action.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ outputs:
2727

2828
runs:
2929
using: 'docker'
30-
image: "docker://ghcr.io/elastic/docs-assembler:edge"
31-
env:
32-
INPUT_COMMAND: "content-source match"
30+
image: "docker://ghcr.io/elastic/docs-builder:edge"
31+
args:
32+
- "assembler"
33+
- "content-source"
34+
- "match"

actions/validate-inbound-local/action.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ name: 'Validate Inbound Links'
22
description: 'Validates all published cross links from all known repositories against local links.json'
33

44
runs:
5-
using: "composite"
6-
steps:
7-
- name: Validate Inbound Links
8-
uses: elastic/docs-builder/actions/assembler@main
9-
with:
10-
command: "inbound-links validate-link-reference"
5+
using: 'docker'
6+
image: "docker://ghcr.io/elastic/docs-builder:edge"
7+
args:
8+
- "inbound-links"
9+
- "validate-link-reference"

actions/validate-path-prefixes-local/action.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: 'Validate Global Path Prefixes'
22
description: 'Validates local path prefixes in local links.json against claimed prefixes in assemblers navigation.yml '
33

44
runs:
5-
using: "composite"
6-
steps:
7-
- name: Validate Inbound Links
8-
uses: elastic/docs-builder/actions/assembler@main
9-
with:
10-
command: "navigation validate-link-reference"
5+
using: 'docker'
6+
image: "docker://ghcr.io/elastic/docs-builder:edge"
7+
args:
8+
- "assembler"
9+
- "navigation"
10+
- "validate-link-reference"

docs-builder.sln

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "assembler-match", "assemble
9898
actions\assembler-match\action.yml = actions\assembler-match\action.yml
9999
EndProjectSection
100100
EndProject
101-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "assembler-config-validate", "assembler-config-validate", "{E20FEEF9-1D1A-4CDA-A546-7FDC573BE399}"
102-
ProjectSection(SolutionItems) = preProject
103-
actions\assembler-config-validate\action.yml = actions\assembler-config-validate\action.yml
104-
EndProjectSection
105-
EndProject
106101
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elastic.Documentation.LinkIndex", "src\Elastic.Documentation.LinkIndex\Elastic.Documentation.LinkIndex.csproj", "{FD1AC230-798B-4AB9-8CE6-A06264885DBC}"
107102
EndProject
108103
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elastic.ApiExplorer", "src\Elastic.ApiExplorer\Elastic.ApiExplorer.csproj", "{C883AC18-7C6A-482E-A9D7-C44DF8633425}"
@@ -307,7 +302,6 @@ Global
307302
{059E787F-85C1-43BE-9DD6-CE319E106383} = {BE6011CC-1200-4957-B01F-FCCA10C5CF5A}
308303
{7D36DDDA-9E0B-4D2C-8033-5D62FF8B6166} = {059E787F-85C1-43BE-9DD6-CE319E106383}
309304
{FB1C1954-D8E2-4745-BA62-04DD82FB4792} = {245023D2-D3CA-47B9-831D-DAB91A2FFDC7}
310-
{E20FEEF9-1D1A-4CDA-A546-7FDC573BE399} = {245023D2-D3CA-47B9-831D-DAB91A2FFDC7}
311305
{FD1AC230-798B-4AB9-8CE6-A06264885DBC} = {BE6011CC-1200-4957-B01F-FCCA10C5CF5A}
312306
{C883AC18-7C6A-482E-A9D7-C44DF8633425} = {BE6011CC-1200-4957-B01F-FCCA10C5CF5A}
313307
{0331559E-4ED1-4A56-9C35-3EAD4D7E696D} = {67B576EE-02FA-4F9B-94BC-3630BC09ECE5}

0 commit comments

Comments
 (0)