Skip to content

Commit

Permalink
Bump .NET SDK to 7.0.401/6.0.414 (#2972)
Browse files Browse the repository at this point in the history
* Bump .NET6 SDK to 6.0.414

* Bump .NET7 SDK to 7.0.401

* Update dotnet-install sha

* Fix alpine docker build
  • Loading branch information
Kielek authored Sep 21, 2023
1 parent b0acb68 commit 17ec6ae
Show file tree
Hide file tree
Showing 9 changed files with 31 additions and 31 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-nuget-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ jobs:
- uses: actions/[email protected]
with:
dotnet-version: |
6.0.413
7.0.400
6.0.414
7.0.401
- name: Check for NuGet packages cache
uses: actions/[email protected]
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ jobs:
- uses: actions/[email protected]
with:
dotnet-version: |
6.0.413
7.0.400
6.0.414
7.0.401
- name: Check for NuGet packages cache
uses: actions/[email protected]
id: nuget-cache
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ jobs:
- uses: actions/[email protected]
with:
dotnet-version: |
6.0.413
7.0.400
6.0.414
7.0.401
- name: Check for NuGet packages cache
uses: actions/[email protected]
id: nuget-cache
Expand Down Expand Up @@ -94,8 +94,8 @@ jobs:
- uses: actions/[email protected]
with:
dotnet-version: |
6.0.413
7.0.400
6.0.414
7.0.401
- name: Check for NuGet packages cache
uses: actions/[email protected]
id: nuget-cache
Expand Down Expand Up @@ -125,8 +125,8 @@ jobs:
- uses: actions/[email protected]
with:
dotnet-version: |
6.0.413
7.0.400
6.0.414
7.0.401
- name: Check for NuGet packages cache
uses: actions/[email protected]
id: nuget-cache
Expand Down Expand Up @@ -199,8 +199,8 @@ jobs:
- uses: actions/[email protected]
with:
dotnet-version: |
6.0.413
7.0.400
6.0.414
7.0.401
- name: Check for NuGet packages cache
uses: actions/[email protected]
id: nuget-cache
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dotnet-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Setup .NET 7.0
uses: actions/[email protected]
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
8 changes: 4 additions & 4 deletions .github/workflows/release-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jobs:
- uses: actions/[email protected]
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: |
Expand Down Expand Up @@ -55,8 +55,8 @@ jobs:
- uses: actions/[email protected]
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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/verify-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ jobs:
- uses: actions/[email protected]
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/[email protected]
Expand Down
20 changes: 10 additions & 10 deletions docker/alpine.dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion docker/centos.dockerfile
Original file line number Diff line number Diff line change
@@ -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 /
Expand Down
2 changes: 1 addition & 1 deletion docker/debian.dockerfile
Original file line number Diff line number Diff line change
@@ -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 && \
Expand Down

0 comments on commit 17ec6ae

Please sign in to comment.