Skip to content

Commit

Permalink
chore: compile projects in .Net6
Browse files Browse the repository at this point in the history
  • Loading branch information
ngruelaneo committed Jun 11, 2024
1 parent 91d3bd1 commit 3df29cf
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ jobs:
if [ "${{ matrix.mtls }}" = "true" ]; then
export Grpc__ClientP12="${{ steps.deploy.outputs.generated-folder }}/certificates/ingress/client.submitter.p12"
fi
dotnet test --runtime linux-x64 -f net8.0 --logger "trx;LogFileName=test-results.trx"
dotnet test --runtime linux-x64 -f net6.0 --logger "trx;LogFileName=test-results.trx"
- name: Test Report
uses: dorny/test-reporter@v1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ COPY . .

WORKDIR "/src/Tests/ArmoniK.EndToEndTests/ArmoniK.EndToEndTests.Worker"

RUN dotnet publish -a "${TARGETARCH}" --self-contained -c Release -f net8.0 .
RUN dotnet publish -a "${TARGETARCH}" --self-contained -c Release -f net6.0 .


FROM ${WORKER_DLL_IMAGE} AS final
Expand Down
2 changes: 1 addition & 1 deletion Tests/endToEndTests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export MODE="All"
export SERVER_NFS_IP=""
export STORAGE_TYPE="HostPath"
configuration="Release"
FRAMEWORK=net8.0
FRAMEWORK=net6.0
OUTPUT_JSON="nofile"
TO_BUCKET=false
PACKAGE_NAME="ArmoniK.EndToEndTests.Worker-v1.0.0-700.zip"
Expand Down
4 changes: 2 additions & 2 deletions Worker/src/DLLWorker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ RUN dotnet restore -a "${TARGETARCH}" "Worker/src/DLLWorker/ArmoniK.DevelopmentK
COPY . .
WORKDIR "/src/Worker/src/DLLWorker"
ARG BUILD_CONFIG=Release
RUN dotnet build "ArmoniK.DevelopmentKit.Worker.DLLWorker.csproj" -c "${BUILD_CONFIG}" -f net8.0 -o /app/build
RUN dotnet build "ArmoniK.DevelopmentKit.Worker.DLLWorker.csproj" -c "${BUILD_CONFIG}" -f net6.0 -o /app/build

FROM build AS publish
RUN dotnet publish -a "${TARGETARCH}" "ArmoniK.DevelopmentKit.Worker.DLLWorker.csproj" -c "${BUILD_CONFIG}" -f net8.0 -o /app/publish --self-contained true
RUN dotnet publish -a "${TARGETARCH}" "ArmoniK.DevelopmentKit.Worker.DLLWorker.csproj" -c "${BUILD_CONFIG}" -f net6.0 -o /app/publish --self-contained true

FROM base AS final

Expand Down

0 comments on commit 3df29cf

Please sign in to comment.