From c039418424c978f208bf7293688a59bf2c5c6159 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Oct 2023 12:36:45 +0000 Subject: [PATCH 1/2] Bump dotnet/sdk from 7.0.401-alpine3.18 to 7.0.402-alpine3.18 in /docker Bumps dotnet/sdk from 7.0.401-alpine3.18 to 7.0.402-alpine3.18. --- updated-dependencies: - dependency-name: dotnet/sdk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- docker/alpine.dockerfile | 2 +- docker/debian.dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/alpine.dockerfile b/docker/alpine.dockerfile index ba9c67aea5..16c7c8a23f 100644 --- a/docker/alpine.dockerfile +++ b/docker/alpine.dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:7.0.401-alpine3.18 +FROM mcr.microsoft.com/dotnet/sdk:7.0.402-alpine3.18 RUN apk update \ && apk upgrade \ diff --git a/docker/debian.dockerfile b/docker/debian.dockerfile index 7603897851..ad1fb8af9e 100644 --- a/docker/debian.dockerfile +++ b/docker/debian.dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:7.0.401-bullseye-slim +FROM mcr.microsoft.com/dotnet/sdk:7.0.402-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 && \ From fe28a8502972ea86b086fd688c9286c4dc1a7d31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= Date: Wed, 11 Oct 2023 16:53:21 +0200 Subject: [PATCH 2/2] Bump other places --- .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 | 2 +- docker/centos.dockerfile | 2 +- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build-nuget-packages.yml b/.github/workflows/build-nuget-packages.yml index 3f500e816f..6607e02989 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.414 - 7.0.401 + 6.0.415 + 7.0.402 - 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 2a32f1dffe..cbef6f7df6 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.414 - 7.0.401 + 6.0.415 + 7.0.402 - 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 d200afec63..4ddc217da4 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.414 - 7.0.401 + 6.0.415 + 7.0.402 - 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.414 - 7.0.401 + 6.0.415 + 7.0.402 - 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.414 - 7.0.401 + 6.0.415 + 7.0.402 - 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.414 - 7.0.401 + 6.0.415 + 7.0.402 - 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 67a02bc555..412d815516 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.401 + dotnet-version: 7.0.402 - 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 b0cb0b2313..529bab22cb 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.414 - 7.0.401 + 6.0.415 + 7.0.402 - 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.414 - 7.0.401 + 6.0.415 + 7.0.402 - 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 cc91f28131..3dfa925265 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.414 - 7.0.401 + 6.0.415 + 7.0.402 - 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 16c7c8a23f..da54259f80 100644 --- a/docker/alpine.dockerfile +++ b/docker/alpine.dockerfile @@ -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 "a07fe1945b0e619797125f08762195227e7a76218deeabea0f88d3a0c0588964 dotnet-install.sh" | sha256sum -c \ && chmod +x ./dotnet-install.sh \ - && ./dotnet-install.sh -v 6.0.414 --install-dir /usr/share/dotnet --no-path \ + && ./dotnet-install.sh -v 6.0.415 --install-dir /usr/share/dotnet --no-path \ && rm dotnet-install.sh WORKDIR /project diff --git a/docker/centos.dockerfile b/docker/centos.dockerfile index 4bb720b8a2..dfcc361945 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.414-1 dotnet-sdk-7.0-7.0.401-1 +RUN yum -y install dotnet-sdk-6.0-6.0.415-1 dotnet-sdk-7.0-7.0.402-1 WORKDIR /project COPY ./docker-entrypoint.sh /