From ee9f7d5c47f7a140171f533c0e93cf613da6962f Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Wed, 18 Dec 2024 12:46:34 +0900 Subject: [PATCH] Remove dotnet --- Build/CI/install-env.sh | 10 ++++------ Build/CI/tests.sh | 3 +-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Build/CI/install-env.sh b/Build/CI/install-env.sh index 37bfa5959..337244bf5 100755 --- a/Build/CI/install-env.sh +++ b/Build/CI/install-env.sh @@ -1,6 +1,7 @@ #!/bin/bash -echo "Dotnet is $(whereis dotnet) and PATH is $PATH" +sudo apt remove --purge dotnet* +sudo apt remove --purge aspnetcore* wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh @@ -8,12 +9,9 @@ wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh chmod +x ./dotnet-install.sh ./dotnet-install.sh --version 9.0.101 --channel LTS -/home/runner/.dotnet/dotnet --info +rm -rf /usr/lib/dotnet +sudo ln "$HOME/.dotnet/dotnet" /usr/lib/dotnet [[ "${ADDITIONAL_RUNTIME:-}" ]] \ && echo "Additional Runtime needed: $ADDITIONAL_RUNTIME" \ && ./dotnet-install.sh --version "$ADDITIONAL_RUNTIME" --runtime dotnet --channel LTS - -/home/runner/.dotnet/dotnet --info - -echo "Dotnet is $(whereis dotnet) and PATH is $PATH" \ No newline at end of file diff --git a/Build/CI/tests.sh b/Build/CI/tests.sh index dbc8b9d7d..f30187e2a 100755 --- a/Build/CI/tests.sh +++ b/Build/CI/tests.sh @@ -1,11 +1,10 @@ #!/bin/bash set -e -echo "Dotnet is $(whereis dotnet) and PATH is $PATH" +export PATH="$PATH:$HOME/.dotnet" : "${BUILD_ARGS:=}" - export DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1 dotnet --info dotnet build ./NBitcoin.Tests/NBitcoin.Tests.csproj \