Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into feature/external-logg…
Browse files Browse the repository at this point in the history
…ing-config
  • Loading branch information
Mpdreamz committed Jul 22, 2024
2 parents 05bd107 + 7b2dc2b commit 596a183
Show file tree
Hide file tree
Showing 44 changed files with 841 additions and 821 deletions.
53 changes: 0 additions & 53 deletions .ci/snapshoty.yml

This file was deleted.

83 changes: 0 additions & 83 deletions .ci/updatecli/updatecli.d/update-gherkin-specs.yml

This file was deleted.

83 changes: 0 additions & 83 deletions .ci/updatecli/updatecli.d/update-json-specs.yml

This file was deleted.

85 changes: 0 additions & 85 deletions .ci/updatecli/updatecli.d/update-specs.yml

This file was deleted.

1 change: 1 addition & 0 deletions .ci/updatecli/values.d/apm-data-spec.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
apm_schema_specs_path: src/Elastic.Apm.Specification/specs
1 change: 1 addition & 0 deletions .ci/updatecli/values.d/apm-gherkin.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
apm_gherkin_specs_path: test/Elastic.Apm.Feature.Tests/Features
1 change: 1 addition & 0 deletions .ci/updatecli/values.d/apm-json-specs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
apm_json_specs_path: test/Elastic.Apm.Tests.Utilities/TestResources/json-specs
7 changes: 7 additions & 0 deletions .ci/updatecli/values.d/scm.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
scm:
enabled: true
owner: elastic
repository: apm-agent-dotnet
branch: main

signedcommit: true
14 changes: 0 additions & 14 deletions .ci/updatecli/values.yml

This file was deleted.

6 changes: 1 addition & 5 deletions .github/workflows/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@ There are 4 main stages that run on GitHub actions:
* Test
* Release

There are some other stages that run for every push on the main branches:

* [Snapshoty](./snapshoty.yml)

### Scenarios

* Tests should be triggered on branch, tag and PR basis.
Expand Down Expand Up @@ -39,7 +35,7 @@ The tag release follows the naming convention: `v.<major>.<minor>.<patch>`, wher

### OpenTelemetry

There is a GitHub workflow in charge to populate what the workflow run in terms of jobs and steps. Those details can be seen in [here](https://ela.st/oblt-ci-cd-stats) (**NOTE**: only available for Elasticians).
Every workflow and its logs are exported to OpenTelemetry traces/logs/metrics. Those details can be seen [here](https://ela.st/oblt-ci-cd-stats) (**NOTE**: only available for Elasticians).

## Bump automation

Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/bootstrap/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,18 @@ inputs:
description: 'Install azure functions tool chain ("true" or "false")'
required: false
default: "false"
tc-cloud:
description: 'Bootstrap TestContainers Cloud (TOKEN or "false")'
required: false
default: "false"
outputs:
agent-version:
description: "The current agent version number"
value: ${{ steps.dotnet.outputs.agent-version }}
major-version:
description: "The current major version number, semver"
value: ${{ steps.dotnet.outputs.major-version }}


runs:
using: "composite"
Expand All @@ -27,7 +32,7 @@ runs:
run: |
git fetch --prune --unshallow --tags
git tag --list
- uses: actions/cache@v4
with:
path: ~/.nuget/packages
Expand Down Expand Up @@ -56,10 +61,11 @@ runs:
# Setup git config
- uses: elastic/apm-pipeline-library/.github/actions/setup-git@current

# install common dependencies
- name: Install common dependencies
uses: ./.github/workflows/install-dependencies
with:
rust: '${{ inputs.rust }}'
azure: '${{ inputs.azure }}'
tc-cloud: '${{ inputs.tc-cloud }}'
Loading

0 comments on commit 596a183

Please sign in to comment.