From cee90062f9f1c2591dec336e3391e33f982b1d3e Mon Sep 17 00:00:00 2001 From: Vishwesh Bankwar Date: Thu, 3 Mar 2022 12:47:07 -0800 Subject: [PATCH] Revert .net6.0 explicit installs (#2913) --- .github/workflows/apicompatibility.yml | 7 ----- .github/workflows/code-coverage.yml | 7 ----- .github/workflows/integration.yml | 32 ---------------------- .github/workflows/linux-ci.yml | 18 ------------ .github/workflows/publish-packages-1.0.yml | 5 ---- .github/workflows/windows-ci.yml | 8 ------ 6 files changed, 77 deletions(-) diff --git a/.github/workflows/apicompatibility.yml b/.github/workflows/apicompatibility.yml index 3efbecd4a..108a465b1 100644 --- a/.github/workflows/apicompatibility.yml +++ b/.github/workflows/apicompatibility.yml @@ -9,18 +9,11 @@ on: jobs: build-test: runs-on: windows-latest - # https://github.com/actions/setup-dotnet/issues/122 env: CheckAPICompatibility: true - DOTNET_MULTILEVEL_LOOKUP: 1 steps: - uses: actions/checkout@v2 - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '6.0.x' - include-prerelease: true - - name: Install dependencies run: dotnet restore diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml index 0bcc696a0..8228a7bd1 100644 --- a/.github/workflows/code-coverage.yml +++ b/.github/workflows/code-coverage.yml @@ -13,7 +13,6 @@ on: jobs: build-test-report: runs-on: ${{ matrix.os }} - # https://github.com/actions/setup-dotnet/issues/122 strategy: fail-fast: false @@ -21,18 +20,12 @@ jobs: os: [windows-latest] env: OS: ${{ matrix.os }} - DOTNET_MULTILEVEL_LOOKUP: 1 steps: - uses: actions/checkout@v2 with: fetch-depth: 0 # fetching all - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '6.0.x' - include-prerelease: true - - name: Install dependencies run: dotnet restore diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index a0970cb6a..eca2f96a7 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -13,9 +13,6 @@ on: jobs: redis-test: runs-on: ubuntu-latest - # https://github.com/actions/setup-dotnet/issues/122 - env: - DOTNET_MULTILEVEL_LOOKUP: 1 strategy: fail-fast: false matrix: @@ -23,19 +20,11 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '6.0.x' - include-prerelease: true - - name: Run redis docker-compose.integration run: docker-compose --file=test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/docker-compose.yml --file=build/docker-compose.${{ matrix.version }}.yml --project-directory=. up --exit-code-from=tests --build sql-test: runs-on: ubuntu-latest - # https://github.com/actions/setup-dotnet/issues/122 - env: - DOTNET_MULTILEVEL_LOOKUP: 1 strategy: fail-fast: false matrix: @@ -43,19 +32,11 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '6.0.x' - include-prerelease: true - - name: Run sql docker-compose.integration run: docker-compose --file=test/OpenTelemetry.Instrumentation.SqlClient.Tests/docker-compose.yml --file=build/docker-compose.${{ matrix.version }}.yml --project-directory=. up --exit-code-from=tests --build w3c-trace-context-test: runs-on: ubuntu-latest - # https://github.com/actions/setup-dotnet/issues/122 - env: - DOTNET_MULTILEVEL_LOOKUP: 1 strategy: fail-fast: false matrix: @@ -63,19 +44,11 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '6.0.x' - include-prerelease: true - - name: Run W3C Trace Context docker-compose.integration run: docker-compose --file=test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/docker-compose.yml --file=build/docker-compose.${{ matrix.version }}.yml --project-directory=. up --exit-code-from=tests --build otlp-exporter-test: runs-on: ubuntu-latest - # https://github.com/actions/setup-dotnet/issues/122 - env: - DOTNET_MULTILEVEL_LOOKUP: 1 strategy: fail-fast: false matrix: @@ -83,10 +56,5 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '6.0.x' - include-prerelease: true - - name: Run OTLP Exporter docker-compose.integration run: docker-compose --file=test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/docker-compose.yml --file=build/docker-compose.${{ matrix.version }}.yml --project-directory=. up --exit-code-from=tests --build diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml index 7f90e2e9b..aefe303dd 100644 --- a/.github/workflows/linux-ci.yml +++ b/.github/workflows/linux-ci.yml @@ -13,9 +13,6 @@ on: jobs: build-test: runs-on: ubuntu-latest - # https://github.com/actions/setup-dotnet/issues/122 - env: - DOTNET_MULTILEVEL_LOOKUP: 1 strategy: matrix: @@ -24,19 +21,6 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '3.1.x' - - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '5.0.x' - - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '6.0.x' - include-prerelease: true - - name: Install dependencies run: dotnet restore @@ -44,6 +28,4 @@ jobs: run: dotnet build --configuration Release --no-restore - name: Test ${{ matrix.version }} - env: - DOTNET_MULTILEVEL_LOOKUP: 1 run: dotnet test **/bin/**/${{ matrix.version }}/*.Tests.dll --configuration Release --no-build --logger:"console;verbosity=detailed" diff --git a/.github/workflows/publish-packages-1.0.yml b/.github/workflows/publish-packages-1.0.yml index 971ab5971..ed5b48902 100644 --- a/.github/workflows/publish-packages-1.0.yml +++ b/.github/workflows/publish-packages-1.0.yml @@ -32,11 +32,6 @@ jobs: fetch-depth: 0 # fetching all ref: ${{ matrix.branches }} - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '6.0.x' - include-prerelease: true - - name: Install dependencies run: dotnet restore diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml index 8f3863303..b777abfba 100644 --- a/.github/workflows/windows-ci.yml +++ b/.github/workflows/windows-ci.yml @@ -13,9 +13,6 @@ on: jobs: build-test: runs-on: windows-latest - # https://github.com/actions/setup-dotnet/issues/122 - env: - DOTNET_MULTILEVEL_LOOKUP: 1 strategy: matrix: @@ -24,11 +21,6 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '6.0.x' - include-prerelease: true - - name: Install dependencies run: dotnet restore