Skip to content

Commit dca5900

Browse files
authored
Merge branch 'main' into copilot/fix-1898
2 parents 878e93e + b767046 commit dca5900

File tree

128 files changed

+3221
-1067
lines changed

Some content is hidden

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

128 files changed

+3221
-1067
lines changed

.github/updatecli/updatecli.d/versions.yml

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ targets:
303303
kind: yaml
304304
spec:
305305
file: config/versions.yml
306-
key: versioning_systems.edot_android.current
306+
key: versioning_systems.edot-android.current
307307

308308
update-docs-docset-collector:
309309
name: 'Update config/versions.yml edot-collector {{ source "latest-edot-collector-version" }}'
@@ -312,7 +312,7 @@ targets:
312312
kind: yaml
313313
spec:
314314
file: config/versions.yml
315-
key: $.versioning_systems.edot_collector.current
315+
key: $.versioning_systems.edot-collector.current
316316

317317
update-docs-docset-dotnet:
318318
name: 'Update config/versions.yml edot-dotnet {{ source "latest-edot-dotnet-version" }}'
@@ -321,7 +321,7 @@ targets:
321321
kind: yaml
322322
spec:
323323
file: config/versions.yml
324-
key: versioning_systems.edot_dotnet.current
324+
key: versioning_systems.edot-dotnet.current
325325

326326
update-docs-docset-ios:
327327
name: 'Update config/versions.yml edot-ios {{ source "latest-edot-ios-version" }}'
@@ -330,7 +330,7 @@ targets:
330330
kind: yaml
331331
spec:
332332
file: config/versions.yml
333-
key: versioning_systems.edot_ios.current
333+
key: versioning_systems.edot-ios.current
334334

335335
update-docs-docset-java:
336336
name: 'Update config/versions.yml edot-java {{ source "latest-edot-java-version" }}'
@@ -339,7 +339,7 @@ targets:
339339
kind: yaml
340340
spec:
341341
file: config/versions.yml
342-
key: versioning_systems.edot_java.current
342+
key: versioning_systems.edot-java.current
343343

344344
update-docs-docset-node:
345345
name: 'Update config/versions.yml edot-node {{ source "latest-edot-node-version" }}'
@@ -348,7 +348,7 @@ targets:
348348
kind: yaml
349349
spec:
350350
file: config/versions.yml
351-
key: versioning_systems.edot_node.current
351+
key: versioning_systems.edot-node.current
352352

353353
update-docs-docset-php:
354354
name: 'Update config/versions.yml edot-php {{ source "latest-edot-php-version" }}'
@@ -357,7 +357,7 @@ targets:
357357
kind: yaml
358358
spec:
359359
file: config/versions.yml
360-
key: versioning_systems.edot_php.current
360+
key: versioning_systems.edot-php.current
361361

362362
update-docs-docset-python:
363363
name: 'Update config/versions.yml edot-python {{ source "latest-edot-python-version" }}'
@@ -366,7 +366,7 @@ targets:
366366
kind: yaml
367367
spec:
368368
file: config/versions.yml
369-
key: versioning_systems.edot_python.current
369+
key: versioning_systems.edot-python.current
370370

371371
update-docs-docset-eck:
372372
name: 'Update config/versions.yml eck {{ source "latest-eck-version" }}'
@@ -396,73 +396,73 @@ targets:
396396
key: versioning_systems.curator.current
397397

398398
update-docs-docset-apm-agent-dotnet:
399-
name: 'Update config/versions.yml apm_agent_dotnet {{ source "latest-apm-agent-dotnet-version" }}'
399+
name: 'Update config/versions.yml apm-agent-dotnet {{ source "latest-apm-agent-dotnet-version" }}'
400400
scmid: githubConfig
401401
sourceid: latest-apm-agent-dotnet-version
402402
kind: yaml
403403
spec:
404404
file: config/versions.yml
405-
key: versioning_systems.apm_agent_dotnet.current
405+
key: versioning_systems.apm-agent-dotnet.current
406406

407407
update-docs-docset-apm-agent-go:
408-
name: 'Update config/versions.yml apm_agent_go {{ source "latest-apm-agent-go-version" }}'
408+
name: 'Update config/versions.yml apm-agent-go {{ source "latest-apm-agent-go-version" }}'
409409
scmid: githubConfig
410410
sourceid: latest-apm-agent-go-version
411411
kind: yaml
412412
spec:
413413
file: config/versions.yml
414-
key: versioning_systems.apm_agent_go.current
414+
key: versioning_systems.apm-agent-go.current
415415

416416
update-docs-docset-apm-agent-java:
417-
name: 'Update config/versions.yml apm_agent_java {{ source "latest-apm-agent-java-version" }}'
417+
name: 'Update config/versions.yml apm-agent-java {{ source "latest-apm-agent-java-version" }}'
418418
scmid: githubConfig
419419
sourceid: latest-apm-agent-java-version
420420
kind: yaml
421421
spec:
422422
file: config/versions.yml
423-
key: versioning_systems.apm_agent_java.current
423+
key: versioning_systems.apm-agent-java.current
424424

425425
update-docs-docset-apm-agent-node:
426-
name: 'Update config/versions.yml apm_agent_node {{ source "latest-apm-agent-node-version" }}'
426+
name: 'Update config/versions.yml apm-agent-node {{ source "latest-apm-agent-node-version" }}'
427427
scmid: githubConfig
428428
sourceid: latest-apm-agent-node-version
429429
kind: yaml
430430
spec:
431431
file: config/versions.yml
432-
key: versioning_systems.apm_agent_node.current
432+
key: versioning_systems.apm-agent-node.current
433433

434434
update-docs-docset-apm-agent-php:
435-
name: 'Update config/versions.yml apm_agent_php {{ source "latest-apm-agent-php-version" }}'
435+
name: 'Update config/versions.yml apm-agent-php {{ source "latest-apm-agent-php-version" }}'
436436
scmid: githubConfig
437437
sourceid: latest-apm-agent-php-version
438438
kind: yaml
439439
spec:
440440
file: config/versions.yml
441-
key: versioning_systems.apm_agent_php.current
441+
key: versioning_systems.apm-agent-php.current
442442

443443
update-docs-docset-apm-agent-python:
444-
name: 'Update config/versions.yml apm_agent_python {{ source "latest-apm-agent-python-version" }}'
444+
name: 'Update config/versions.yml apm-agent-python {{ source "latest-apm-agent-python-version" }}'
445445
scmid: githubConfig
446446
sourceid: latest-apm-agent-python-version
447447
kind: yaml
448448
spec:
449449
file: config/versions.yml
450-
key: versioning_systems.apm_agent_python.current
450+
key: versioning_systems.apm-agent-python.current
451451

452452
update-docs-docset-apm-agent-ruby:
453-
name: 'Update config/versions.yml apm_agent_ruby {{ source "latest-apm-agent-ruby-version" }}'
453+
name: 'Update config/versions.yml apm-agent-ruby {{ source "latest-apm-agent-ruby-version" }}'
454454
scmid: githubConfig
455455
sourceid: latest-apm-agent-ruby-version
456456
kind: yaml
457457
spec:
458458
file: config/versions.yml
459-
key: versioning_systems.apm_agent_ruby.current
459+
key: versioning_systems.apm-agent-ruby.current
460460

461461
update-docs-docset-apm-agent-rum:
462-
name: 'Update config/versions.yml apm_agent_rum {{ source "latest-apm-agent-rum-version" }}'
462+
name: 'Update config/versions.yml apm-agent-rum {{ source "latest-apm-agent-rum-version" }}'
463463
scmid: githubConfig
464464
sourceid: latest-apm-agent-rum-version
465465
kind: yaml
466466
spec:
467467
file: config/versions.yml
468-
key: versioning_systems.apm_agent_rum.current
468+
key: versioning_systems.apm-agent-rum-js.current

.github/workflows/ci.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,12 @@ jobs:
8787
- windows-latest
8888
steps:
8989
- uses: actions/checkout@v5
90+
- name: 'Windows only, set TEMP to the same drive'
91+
if: ${{ matrix.os == 'windows-latest' }}
92+
# temporary waiting for https://github.com/parcel-bundler/parcel/pull/10095 to fix
93+
run: |
94+
mkdir "D:\\Temp"
95+
echo "TEMP=D:\\Temp" >> $env:GITHUB_ENV
9096
9197
- name: Bootstrap Action Workspace
9298
id: bootstrap

.github/workflows/prerelease.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ jobs:
1919
full-version: ${{ steps.bootstrap.outputs.full-version }}
2020
major-version: ${{ steps.bootstrap.outputs.major-version }}
2121
needs: [build]
22+
concurrency:
23+
group: deploy-to-github-pages
2224

2325
environment:
2426
name: github-pages

.github/workflows/release.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,12 @@ jobs:
147147
- uses: actions/checkout@v5
148148
with:
149149
ref: ${{ needs.release-drafter.outputs.tag_name }}
150+
- name: 'Windows only, set TEMP to the same drive'
151+
if: ${{ matrix.os == 'windows-latest' }}
152+
# temporary waiting for https://github.com/parcel-bundler/parcel/pull/10095 to fix
153+
run: |
154+
mkdir "D:\\Temp"
155+
echo "TEMP=D:\\Temp" >> $env:GITHUB_ENV
150156
151157
- name: Bootstrap Action Workspace
152158
id: bootstrap

build/Targets.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ let private runTests (testSuite: TestSuite) _ =
134134
let testFilter =
135135
match testSuite with
136136
| All -> []
137-
| Unit -> ["--filter"; "FullyQualifiedName~.Tests"]
137+
| Unit -> ["--filter"; "FullyQualifiedName~.Tests|FullyQualifiedName~AuthoringTests"]
138138
| Integration -> ["--filter"; "FullyQualifiedName~.IntegrationTests"]
139139

140140
exec {

config/assembler.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ environments:
3030
feature_flags:
3131
LAZY_LOAD_NAVIGATION: true
3232
SEARCH_OR_ASK_AI: true
33-
STAGING_ELASTIC_NAV: true
3433
dev:
3534
uri: http://localhost:4000
3635
content_source: current

0 commit comments

Comments
 (0)