diff --git a/.github/workflows/linux-ci-md.yml b/.github/workflows/ci-md.yml similarity index 88% rename from .github/workflows/linux-ci-md.yml rename to .github/workflows/ci-md.yml index cec69098ec..7e3de1275d 100644 --- a/.github/workflows/linux-ci-md.yml +++ b/.github/workflows/ci-md.yml @@ -5,7 +5,7 @@ # IMPORTANT: This workflow MUST use the same 'name' as the non -md workflow. -name: Linux +name: Build on: pull_request: @@ -17,9 +17,5 @@ jobs: build-test: runs-on: ubuntu-latest - strategy: - matrix: - version: [netcoreapp3.1,net6.0] - steps: - run: 'echo "No build required"' diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/ci.yml similarity index 56% rename from .github/workflows/windows-ci.yml rename to .github/workflows/ci.yml index 541d0b6414..8c6058fa3d 100644 --- a/.github/workflows/windows-ci.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,4 @@ -name: Windows +name: Build on: push: @@ -12,13 +12,18 @@ on: jobs: build-test: - runs-on: windows-latest + strategy: - fail-fast: false # ensures the entire test matrix is run, even if one permutation fails + fail-fast: false # ensures the entire test matrix is run, even if one permutation fails matrix: - version: [net462,netcoreapp3.1,net6.0] + os: [ windows-latest, ubuntu-latest ] + version: [ net462, netcoreapp3.1, net6.0 ] + exclude: + - os: ubuntu-latest + version: net462 + runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 @@ -29,4 +34,4 @@ jobs: run: dotnet build --configuration Release --no-restore - name: Test ${{ matrix.version }} - run: dotnet test **\bin\**\${{ matrix.version }}\*Tests.dll --configuration Release --no-build --logger:"console;verbosity=detailed" + run: dotnet test **/bin/**/${{ matrix.version }}/*Tests.dll --configuration Release --no-build --logger:"console;verbosity=detailed" diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml deleted file mode 100644 index 4bf4d64b68..0000000000 --- a/.github/workflows/linux-ci.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: Linux - -on: - push: - branches: [ main ] - paths-ignore: - - '**.md' - pull_request: - branches: [ main ] - paths-ignore: - - '**.md' - -jobs: - build-test: - runs-on: ubuntu-latest - - strategy: - fail-fast: false # ensures the entire test matrix is run, even if one permutation fails - matrix: - version: [netcoreapp3.1,net6.0] - - steps: - - uses: actions/checkout@v3 - - - name: Install dependencies - run: dotnet restore - - - name: Build - run: dotnet build --configuration Release --no-restore - - - name: Test ${{ matrix.version }} - run: dotnet test **/bin/**/${{ matrix.version }}/*.Tests.dll --configuration Release --no-build --logger:"console;verbosity=detailed" diff --git a/.github/workflows/windows-ci-md.yml b/.github/workflows/windows-ci-md.yml deleted file mode 100644 index 2e2bfd561a..0000000000 --- a/.github/workflows/windows-ci-md.yml +++ /dev/null @@ -1,25 +0,0 @@ -# Syntax: https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions -# See also: https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/troubleshooting-required-status-checks#handling-skipped-but-required-checks - -# Description: This workflow exists to unblock documentation-only PRs. - -# IMPORTANT: This workflow MUST use the same 'name' as the non -md workflow. - -name: Windows - -on: - pull_request: - branches: [ main ] - paths: - - '**.md' - -jobs: - build-test: - runs-on: ubuntu-latest - - strategy: - matrix: - version: [net462,netcoreapp3.1,net6.0] - - steps: - - run: 'echo "No build required"' diff --git a/opentelemetry-dotnet-contrib.sln b/opentelemetry-dotnet-contrib.sln index d0925d4c72..22903a6b99 100644 --- a/opentelemetry-dotnet-contrib.sln +++ b/opentelemetry-dotnet-contrib.sln @@ -27,13 +27,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{ ProjectSection(SolutionItems) = preProject .github\workflows\assign-reviewers.yml = .github\workflows\assign-reviewers.yml .github\workflows\codeql-analysis.yml = .github\workflows\codeql-analysis.yml + .github\workflows\ci-md.yml = .github\workflows\ci-md.yml + .github\workflows\ci.yml = .github\workflows\ci.yml .github\workflows\dotnet-core-cov.yml = .github\workflows\dotnet-core-cov.yml .github\workflows\dotnet-format-md.yml = .github\workflows\dotnet-format-md.yml .github\workflows\dotnet-format.yml = .github\workflows\dotnet-format.yml .github\workflows\integration-md.yml = .github\workflows\integration-md.yml .github\workflows\integration.yml = .github\workflows\integration.yml - .github\workflows\linux-ci-md.yml = .github\workflows\linux-ci-md.yml - .github\workflows\linux-ci.yml = .github\workflows\linux-ci.yml .github\workflows\markdownlint.yml = .github\workflows\markdownlint.yml .github\workflows\package-Exporter.Geneva.yml = .github\workflows\package-Exporter.Geneva.yml .github\workflows\package-Exporter.Instana.yml = .github\workflows\package-Exporter.Instana.yml @@ -63,8 +63,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{ .github\workflows\package-Instrumentation.Wcf.yml = .github\workflows\package-Instrumentation.Wcf.yml .github\workflows\sanitycheck.yml = .github\workflows\sanitycheck.yml .github\workflows\stale.yml = .github\workflows\stale.yml - .github\workflows\windows-ci-md.yml = .github\workflows\windows-ci-md.yml - .github\workflows\windows-ci.yml = .github\workflows\windows-ci.yml EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{824BD1DE-3FA8-4FE0-823A-FD365EAC78AF}"