From 17ec6ae54aa1fec5f7c8bf9a48c0976ae9996ad4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= Date: Thu, 21 Sep 2023 19:04:53 +0200 Subject: [PATCH] Bump .NET SDK to 7.0.401/6.0.414 (#2972) * Bump .NET6 SDK to 6.0.414 * Bump .NET7 SDK to 7.0.401 * Update dotnet-install sha * Fix alpine docker build --- .github/workflows/build-nuget-packages.yml | 4 ++-- .github/workflows/build.yml | 4 ++-- .github/workflows/ci.yml | 16 ++++++++-------- .github/workflows/dotnet-format.yml | 2 +- .github/workflows/release-publish.yml | 8 ++++---- .github/workflows/verify-test.yml | 4 ++-- docker/alpine.dockerfile | 20 ++++++++++---------- docker/centos.dockerfile | 2 +- docker/debian.dockerfile | 2 +- 9 files changed, 31 insertions(+), 31 deletions(-) diff --git a/.github/workflows/build-nuget-packages.yml b/.github/workflows/build-nuget-packages.yml index 01e693d9db..2324562044 100644 --- a/.github/workflows/build-nuget-packages.yml +++ b/.github/workflows/build-nuget-packages.yml @@ -29,8 +29,8 @@ jobs: - uses: actions/setup-dotnet@v3.2.0 with: dotnet-version: | - 6.0.413 - 7.0.400 + 6.0.414 + 7.0.401 - name: Check for NuGet packages cache uses: actions/cache@v3.3.1 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6b2260002d..8955c04d69 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,8 +27,8 @@ jobs: - uses: actions/setup-dotnet@v3.2.0 with: dotnet-version: | - 6.0.413 - 7.0.400 + 6.0.414 + 7.0.401 - name: Check for NuGet packages cache uses: actions/cache@v3.3.1 id: nuget-cache diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 393b834d02..4b48d3af56 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,8 +49,8 @@ jobs: - uses: actions/setup-dotnet@v3.2.0 with: dotnet-version: | - 6.0.413 - 7.0.400 + 6.0.414 + 7.0.401 - name: Check for NuGet packages cache uses: actions/cache@v3.3.1 id: nuget-cache @@ -94,8 +94,8 @@ jobs: - uses: actions/setup-dotnet@v3.2.0 with: dotnet-version: | - 6.0.413 - 7.0.400 + 6.0.414 + 7.0.401 - name: Check for NuGet packages cache uses: actions/cache@v3.3.1 id: nuget-cache @@ -125,8 +125,8 @@ jobs: - uses: actions/setup-dotnet@v3.2.0 with: dotnet-version: | - 6.0.413 - 7.0.400 + 6.0.414 + 7.0.401 - name: Check for NuGet packages cache uses: actions/cache@v3.3.1 id: nuget-cache @@ -199,8 +199,8 @@ jobs: - uses: actions/setup-dotnet@v3.2.0 with: dotnet-version: | - 6.0.413 - 7.0.400 + 6.0.414 + 7.0.401 - name: Check for NuGet packages cache uses: actions/cache@v3.3.1 id: nuget-cache diff --git a/.github/workflows/dotnet-format.yml b/.github/workflows/dotnet-format.yml index 72205737f4..f231eb508b 100644 --- a/.github/workflows/dotnet-format.yml +++ b/.github/workflows/dotnet-format.yml @@ -25,7 +25,7 @@ jobs: - name: Setup .NET 7.0 uses: actions/setup-dotnet@v3.2.0 with: - dotnet-version: 7.0.400 + dotnet-version: 7.0.401 - name: dotnet format run: dotnet format .\OpenTelemetry.AutoInstrumentation.sln --no-restore --verify-no-changes diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml index 7e19294f25..d8c286f58e 100644 --- a/.github/workflows/release-publish.yml +++ b/.github/workflows/release-publish.yml @@ -11,8 +11,8 @@ jobs: - uses: actions/setup-dotnet@v3.2.0 with: dotnet-version: | - 6.0.413 - 7.0.400 + 6.0.414 + 7.0.401 - name: Test the PowerShell module instructions from README.md shell: powershell run: | @@ -55,8 +55,8 @@ jobs: - uses: actions/setup-dotnet@v3.2.0 with: dotnet-version: | - 6.0.413 - 7.0.400 + 6.0.414 + 7.0.401 - run: brew install coreutils if: ${{ runner.os == 'macOS' }} - name: Create test directory diff --git a/.github/workflows/verify-test.yml b/.github/workflows/verify-test.yml index c7d2287fe5..5c0148e4c6 100644 --- a/.github/workflows/verify-test.yml +++ b/.github/workflows/verify-test.yml @@ -30,8 +30,8 @@ jobs: - uses: actions/setup-dotnet@v3.2.0 with: dotnet-version: | - 6.0.413 - 7.0.400 + 6.0.414 + 7.0.401 - run: ./build.cmd BuildTracer ManagedTests --containers ${{ matrix.containers }} --test-project "${{ github.event.inputs.testProject }}" --test-name '"${{ github.event.inputs.testName }}"' --test-count ${{ github.event.inputs.count }} - name: Upload logs uses: actions/upload-artifact@v3.1.3 diff --git a/docker/alpine.dockerfile b/docker/alpine.dockerfile index fba9ffde70..d39a7c4e44 100644 --- a/docker/alpine.dockerfile +++ b/docker/alpine.dockerfile @@ -1,17 +1,17 @@ -FROM mcr.microsoft.com/dotnet/sdk:7.0.400-alpine3.17 +FROM mcr.microsoft.com/dotnet/sdk:7.0.401-alpine3.18 RUN apk update \ && apk upgrade \ && apk add --no-cache --update \ - clang=15.0.7-r0 \ - cmake=3.24.4-r0 \ - make=4.3-r1 \ - bash=5.2.15-r0 \ + clang=16.0.6-r1 \ + cmake=3.26.5-r0 \ + make=4.4.1-r1 \ + bash=5.2.15-r5 \ alpine-sdk=1.0-r1 \ - protobuf=3.21.9-r0 \ - protobuf-dev=3.21.9-r0 \ - grpc=1.50.1-r0 \ - grpc-plugins=1.50.1-r0 + protobuf=3.21.12-r2 \ + protobuf-dev=3.21.12-r2 \ + grpc=1.54.2-r0 \ + grpc-plugins=1.54.2-r0 ENV IsAlpine=true ENV PROTOBUF_PROTOC=/usr/bin/protoc @@ -22,7 +22,7 @@ RUN curl -sSL https://dot.net/v1/dotnet-install.sh --output dotnet-install.sh \ && echo "SHA256: $(sha256sum dotnet-install.sh)" \ && echo "8262a34469d0fc23a1262ec8bad014cf5af40ee93aa7656529115abf3760fe76 dotnet-install.sh" | sha256sum -c \ && chmod +x ./dotnet-install.sh \ - && ./dotnet-install.sh -v 6.0.413 --install-dir /usr/share/dotnet --no-path \ + && ./dotnet-install.sh -v 6.0.414 --install-dir /usr/share/dotnet --no-path \ && rm dotnet-install.sh WORKDIR /project diff --git a/docker/centos.dockerfile b/docker/centos.dockerfile index c894a80b35..4bb720b8a2 100644 --- a/docker/centos.dockerfile +++ b/docker/centos.dockerfile @@ -1,7 +1,7 @@ FROM ghcr.io/open-telemetry/opentelemetry-dotnet-instrumentation-centos7-build-image:main RUN rpm -Uvh https://packages.microsoft.com/config/centos/7/packages-microsoft-prod.rpm -RUN yum -y install dotnet-sdk-6.0-6.0.413-1 dotnet-sdk-7.0-7.0.400-1 +RUN yum -y install dotnet-sdk-6.0-6.0.414-1 dotnet-sdk-7.0-7.0.401-1 WORKDIR /project COPY ./docker-entrypoint.sh / diff --git a/docker/debian.dockerfile b/docker/debian.dockerfile index b27a2a670c..7603897851 100644 --- a/docker/debian.dockerfile +++ b/docker/debian.dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:7.0.400-bullseye-slim +FROM mcr.microsoft.com/dotnet/sdk:7.0.401-bullseye-slim RUN wget https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb -O packages-microsoft-prod.deb && \ dpkg -i packages-microsoft-prod.deb && \