Skip to content

Commit

Permalink
Merge from main.
Browse files Browse the repository at this point in the history
  • Loading branch information
CodeBlanch committed Jan 8, 2024
2 parents 0e71ee6 + 88493d2 commit c4e9a0f
Show file tree
Hide file tree
Showing 47 changed files with 1,027 additions and 543 deletions.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Please provide a brief description of the changes here.

## Merge requirement checklist

* [ ] [CONTRIBUTING](https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/CONTRIBUTING.md) guidelines followed (nullable enabled, static analysis, etc.)
* [ ] [CONTRIBUTING](https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/CONTRIBUTING.md) guidelines followed (license requirements, nullable enabled, static analysis, etc.)
* [ ] Unit tests added/updated
* [ ] Appropriate `CHANGELOG.md` files updated for non-trivial changes
* [ ] Changes in public API reviewed (if applicable)
31 changes: 28 additions & 3 deletions .github/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,32 @@ comment:
require_changes: no

ignore:
- "docs/**/*"
- "examples/**/*"
- "test/**/*"
- "**.md"
- ".github"
- ".vscode"
- "build"
- "docs"
- "examples"
- "src/Shared"
- "test"

flags:
unittests-Solution-Stable:
carryforward: true
paths:
- src

unittests-Solution-Experimental:
carryforward: true
paths:
- src

unittests-Instrumentation-Stable:
carryforward: true
paths:
- src

unittests-Instrumentation-Experimental:
carryforward: true
paths:
- src
80 changes: 80 additions & 0 deletions .github/workflows/Component.BuildTest.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
# Called by ci.yml to build & test project files
# See: https://docs.github.com/en/actions/using-workflows/reusing-workflows#creating-a-reusable-workflow
name: Build Component

on:
workflow_call:
inputs:
project-name:
required: true
type: string
project-build-commands:
default: ''
required: false
type: string
code-cov-name:
required: true
type: string
code-cov-prefix:
default: 'unittests'
required: false
type: string
os-list:
default: '[ "windows-latest", "ubuntu-latest" ]'
required: false
type: string
tfm-list:
default: '[ "net462", "net6.0", "net7.0", "net8.0" ]'
required: false
type: string

jobs:
build-test:

strategy:
fail-fast: false # ensures the entire test matrix is run, even if one permutation fails
matrix:
os: ${{ fromJSON(inputs.os-list) }}
version: ${{ fromJSON(inputs.tfm-list) }}
exclude:
- os: ubuntu-latest
version: net462

runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
with:
# Note: By default GitHub only fetches 1 commit. MinVer needs to find
# the version tag which is typically NOT on the first commit so we
# retrieve them all.
fetch-depth: 0

- name: Setup dotnet
uses: actions/setup-dotnet@v4

- name: dotnet restore ${{ inputs.project-name }}
run: dotnet restore ${{ inputs.project-name }} ${{ inputs.project-build-commands }}

- name: dotnet build ${{ inputs.project-name }}
run: dotnet build ${{ inputs.project-name }} --configuration Release --no-restore ${{ inputs.project-build-commands }}

- name: dotnet test ${{ inputs.project-name }}
run: dotnet test ${{ inputs.project-name }} --collect:"Code Coverage" --results-directory:TestResults --framework ${{ matrix.version }} --configuration Release --no-restore --no-build --logger:"console;verbosity=detailed" -- RunConfiguration.DisableAppDomain=true

- name: Install coverage tool
run: dotnet tool install -g dotnet-coverage

- name: Merging test results
run: dotnet-coverage merge -r -f cobertura -o ./TestResults/Cobertura.xml ./TestResults/*.coverage

- name: Upload code coverage ${{ inputs.code-cov-prefix }}-${{ inputs.code-cov-name }}
uses: codecov/[email protected]
continue-on-error: true # Note: Don't fail for upload failures
env:
OS: ${{ matrix.os }}
TFM: ${{ matrix.version }}
with:
file: TestResults/Cobertura.xml
env_vars: OS,TFM
flags: ${{ inputs.code-cov-prefix }}-${{ inputs.code-cov-name }}
name: Code Coverage for ${{ inputs.code-cov-prefix }}-${{ inputs.code-cov-name }} on [${{ matrix.os }}.${{ matrix.version }}]
26 changes: 0 additions & 26 deletions .github/workflows/ci-aot-md.yml

This file was deleted.

33 changes: 0 additions & 33 deletions .github/workflows/ci-concurrency-md.yml

This file was deleted.

28 changes: 0 additions & 28 deletions .github/workflows/ci-instrumentation-libraries-md.yml

This file was deleted.

41 changes: 0 additions & 41 deletions .github/workflows/ci-instrumentation-libraries.yml

This file was deleted.

41 changes: 0 additions & 41 deletions .github/workflows/ci-md.yml

This file was deleted.

Loading

0 comments on commit c4e9a0f

Please sign in to comment.