Skip to content

Commit

Permalink
update 8.0 in qinglong scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
RayWangQvQ committed Feb 15, 2025
1 parent 25a69d0 commit c827dde
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion docker/build/buildImage.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
REM start to build
echo Start to build docker image
@echo on
docker build --tag zai7lou/bilibili_tool_pro:0.2.2 --tag zai7lou/bilibili_tool_pro:latest ../..
docker build --tag zai7lou/bilibili_tool_pro:latest ../..
@echo off
pause
2 changes: 1 addition & 1 deletion docker/build/buildImage_amd64.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ REM https://www.docker.com/blog/multi-arch-build-and-images-the-simple-way/
REM https://segmentfault.com/a/1190000021166703
echo Start to build docker image with amd64-arch
@echo on
docker buildx build --tag zai7lou/bilibili_tool_pro:0.0.5 --output "type=image,push=false" --platform linux/amd64 ../..
docker buildx build --tag zai7lou/bilibili_tool_pro:latest --output "type=image,push=false" --platform linux/amd64 ../..
@echo off
pause
2 changes: 1 addition & 1 deletion podman/build/buildImage.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
REM start to build
echo Start to build image
@echo on
podman build -t docker.io/zai7lou/bilibili_tool_pro:0.2.2 -t docker.io/zai7lou/bilibili_tool_pro:latest ../..
podman build -t docker.io/zai7lou/bilibili_tool_pro:latest ../..
@echo off
pause
6 changes: 3 additions & 3 deletions qinglong/DefaultTasks/bili_task_base.sh
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ install_dotnet_by_script() {
eval $invocation

say "再尝试使用官方脚本安装"
curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --channel 6.0 --no-cdn --verbose
curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --channel 8.0 --no-cdn --verbose

say "添加到PATH"
local exportFile="/root/.bashrc"
Expand Down Expand Up @@ -353,7 +353,7 @@ install_dotnet() {
curl -o packages-microsoft-prod.deb https://packages.microsoft.com/config/debian/$VERSION_ID/packages-microsoft-prod.deb
dpkg -i packages-microsoft-prod.deb
rm packages-microsoft-prod.deb
apt-get update && apt-get install -y dotnet-sdk-6.0
apt-get update && apt-get install -y dotnet-sdk-8.0
} || {
install_dotnet_by_script
}
Expand All @@ -367,7 +367,7 @@ install_dotnet() {
apk update
fi
{
apk add dotnet6-sdk
apk add dotnet8-sdk
} || {
install_dotnet_by_script
}
Expand Down
8 changes: 4 additions & 4 deletions qinglong/DefaultTasks/dev/bili_dev_task_base.sh
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ check_dotnet() {
eval $invocation

dotnetVersion=$(dotnet --version)
if [[ $dotnetVersion == 6.* ]]; then
if [[ $dotnetVersion == 8.* ]]; then
say "已安装dotnet,当前版本:$dotnetVersion"
say "which dotnet: $(which dotnet)"
return 0
Expand Down Expand Up @@ -321,7 +321,7 @@ install_dotnet_by_script() {
eval $invocation

say "再尝试使用官方脚本安装"
curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --channel 6.0 --no-cdn --verbose
curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --channel 8.0 --no-cdn --verbose

say "添加到PATH"
local exportFile="/root/.bashrc"
Expand Down Expand Up @@ -353,7 +353,7 @@ install_dotnet() {
curl -o packages-microsoft-prod.deb https://packages.microsoft.com/config/debian/$VERSION_ID/packages-microsoft-prod.deb
dpkg -i packages-microsoft-prod.deb
rm packages-microsoft-prod.deb
apt-get update && apt-get install -y dotnet-sdk-6.0
apt-get update && apt-get install -y dotnet-sdk-8.0
} || {
install_dotnet_by_script
}
Expand All @@ -367,7 +367,7 @@ install_dotnet() {
apk update
fi
{
apk add dotnet6-sdk
apk add dotnet8-sdk
} || {
install_dotnet_by_script
}
Expand Down

0 comments on commit c827dde

Please sign in to comment.