Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

install dotnet in prepare-machine.ps1 #4363

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

install dotnet in prepare-machine.ps1 #4363

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d785357
install dotnet in prepare-machine.ps1
ami-GS Jun 18, 2024
681aab6
return
ami-GS Jun 18, 2024
40c9082
idempotency
ami-GS Jul 3, 2024
0d80563
add y
ami-GS Nov 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/log_wrapper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ if [ $sessionCreated -eq 0 ]; then
lttng destroy msquic

babeltrace --names all $dirname/data > $dirname/quic.babel.txt
./submodules/clog/src/clog2text/clog2text_lttng/bin/Release/net6.0/publish/clog2text_lttng -i $dirname/quic.babel.txt -s ./src/manifest/clog.sidecar -o $dirname/quic.log --showTimestamp --showCpuInfo
./submodules/clog/src/clog2text/clog2text_lttng/bin/Debug/net6.0/publish/clog2text_lttng -i $dirname/quic.babel.txt -s ./src/manifest/clog.sidecar -o $dirname/quic.log --showTimestamp --showCpuInfo
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We shouldn't be using debug

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pwsh ./scripts/prepare-machine.ps1 generates this Debug build automatically though

Maybe this

    dotnet build (Join-Path $RootDir submodules clog)

fi
17 changes: 17 additions & 0 deletions scripts/prepare-machine.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,24 @@ function Install-DotnetTool {
}
}

function Install-Dotnet {
if (!$IsLinux) {
Write-Host "Linux only"
return
}

Write-Host "Installing dotnet"
# known issue https://learn.microsoft.com/en-us/dotnet/core/install/linux-package-mixup?pivots=os-linux-ubuntu
sudo bash -c "echo 'Package: dotnet* aspnet* netstandard*' >> /etc/apt/preferences"
sudo bash -c "echo 'Pin: origin packages.microsoft.com' >> /etc/apt/preferences"
sudo bash -c "echo 'Pin-Priority: -10' >> /etc/apt/preferences"
sudo apt-get update -y
sudo apt-get install dotnet-sdk-6.0 aspnetcore-runtime-6.0 dotnet-runtime-6.0
}

function Install-Clog2Text {
Install-Dotnet

Write-Host "Initializing clog submodule"
git submodule init $RootDir/submodules/clog
git submodule update
Expand Down
Loading