From 96aef4df168add983a4b60165819d7cfda4d4b7c Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Thu, 19 Sep 2024 13:52:47 +0800 Subject: [PATCH] chore(Docker): update docker auto script (#4327) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * doc: 更新文档 * style: 调整 H3 下边距 * chore: 更新字典 * doc: 更新配置文件 * chore: 更新 PR 模板 * chore: 更新 Docker 镜像脚本 --- .github/PULL_REQUEST_TEMPLATE/servicing.md | 45 -------- .github/pull_request_template.md | 49 +++++++-- .github/workflows/deploy.yml | 25 ----- .github/workflows/docker.yml | 6 +- .github/workflows/release.yml | 104 ------------------ exclusion.dic | 1 + .../Components/Samples/CodeEditors.razor | 6 +- src/BootstrapBlazor.Server/Dockerfile | 4 +- src/BootstrapBlazor.Server/docs.json | 1 - .../wwwroot/css/site.css | 2 +- 10 files changed, 50 insertions(+), 193 deletions(-) delete mode 100644 .github/PULL_REQUEST_TEMPLATE/servicing.md delete mode 100644 .github/workflows/deploy.yml delete mode 100644 .github/workflows/release.yml diff --git a/.github/PULL_REQUEST_TEMPLATE/servicing.md b/.github/PULL_REQUEST_TEMPLATE/servicing.md deleted file mode 100644 index 59ad82ee7..000000000 --- a/.github/PULL_REQUEST_TEMPLATE/servicing.md +++ /dev/null @@ -1,45 +0,0 @@ -# {PR title} - -Summary of the changes (Less than 80 chars) - -## Description - -{Detail} - -Fixes #{bug number} (in this specific format) - -## Customer Impact - -{Justification} - -## Regression? - -- [ ] Yes -- [ ] No - -[If yes, specify the version the behavior has regressed from] - -## Risk - -- [ ] High -- [ ] Medium -- [ ] Low - -[Justify the selection above] - -## Verification - -- [ ] Manual (required) -- [ ] Automated - -## Packaging changes reviewed? - -- [ ] Yes -- [ ] No -- [ ] N/A - ----- - -## When servicing release/2.1 - -- [ ] Make necessary changes in eng/PatchConfig.props diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index b3656c9d2..1d5fcd7e8 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,14 +1,47 @@ -## {PR title} +# {PR title} - +Summary of the changes (Less than 80 chars) - +简单描述你更改了什么, 不超过80个字符；如果有关联 Issue 请在下方填写相关编号 - +## Description - +{Detail} -### Description +Fixes #{bug number} (in this specific format) -close #{bug number} +## Regression? + +- [ ] Yes +- [ ] No + +[If yes, specify the version the behavior has regressed from] + +[是否影响老版本] + +## Risk + +- [ ] High +- [ ] Medium +- [ ] Low + +[Justify the selection above] + +## Verification + +- [ ] Manual (required) +- [ ] Automated + +## Packaging changes reviewed? + +- [ ] Yes +- [ ] No +- [ ] N/A + +## ☑️ Self Check before Merge + +⚠️ Please check all items below before review. ⚠️ + +- [ ] Doc is updated/provided or not needed +- [ ] Demo is updated/provided or not needed +- [ ] Merge the latest code from the main branch diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml deleted file mode 100644 index c3668db71..000000000 --- a/.github/workflows/deploy.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: Deploy to Huawei VM - -on: - push: - branches: - - master-off - -jobs: - deploy: - runs-on: ubuntu-latest - - steps: - - name: Sync Huawei Clound VM - uses: appleboy/ssh-action@master - env: - BRANCH_NAME: ${{ env.GITHUB_REF }} - with: - host: ${{ secrets.SSH_HOST }} - username: ${{ secrets.SSH_USERNAME }} - key: ${{ secrets.SSH_KEY }} - port: 22 - script: | - cd ~/BootstrapBlazor - git checkout dev - sh ~/deploy-blazor.sh diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index deccce6fe..f89716fde 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -3,7 +3,7 @@ name: Build docker image on: push: branches: - - dev-dockerfile + - pack jobs: docker: @@ -12,13 +12,13 @@ jobs: steps: - uses: actions/checkout@v4 - name: Login to Docker Hub - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push Docker images - uses: docker/build-push-action@v2.7.0 + uses: docker/build-push-action@v6 with: file: src/BootstrapBlazor.Server/Dockerfile push: true diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index 28c5671f7..000000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,104 +0,0 @@ -name: Package extensions to Nuget - -on: - push: - branches: - - release - -jobs: - release: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v4 - - - name: Setup .NET Core SDK - uses: actions/setup-dotnet@v4 - with: - dotnet-version: 8.0.x - - - name: Publish to Nuget - env: - NUGET_API_KEY: ${{secrets.NUGET_API_KEY}} - Bundle: True - run: | - dotnet pack src/Extensions/Components/BootstrapBlazor.AzureOpenAI -c Release -o publish - dotnet nuget push publish/BootstrapBlazor.AzureOpenAI.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate - - dotnet pack src/Extensions/Components/BootstrapBlazor.AzureSpeech -c Release -o publish - dotnet nuget push publish/BootstrapBlazor.AzureSpeech.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate - - dotnet pack src/Extensions/Components/BootstrapBlazor.BaiduOcr -c Release -o publish - dotnet nuget push publish/BootstrapBlazor.BaiduOcr.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate - - dotnet pack src/Extensions/Components/BootstrapBlazor.BaiduSpeech -c Release -o publish - dotnet nuget push publish/BootstrapBlazor.BaiduSpeech.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate - - dotnet pack src/Extensions/Components/BootstrapBlazor.BarCode -c Release -o publish - dotnet nuget push publish/BootstrapBlazor.BarCode.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate - - dotnet pack src/Extensions/Components/BootstrapBlazor.Chart -c Release -o publish - dotnet nuget push publish/BootstrapBlazor.Chart.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate - - dotnet pack src/Extensions/Components/BootstrapBlazor.CherryMarkdown -c Release -o publish - dotnet nuget push publish/BootstrapBlazor.CherryMarkdown.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate - - dotnet pack src/Extensions/Components/BootstrapBlazor.CodeEditor -c Release -o publish - dotnet nuget push publish/BootstrapBlazor.CodeEditor.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate - - dotnet pack src/Extensions/Components/BootstrapBlazor.Dock -c Release -o publish - dotnet nuget push publish/BootstrapBlazor.Dock.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate - - dotnet pack src/Extensions/Components/BootstrapBlazor.FloatingUI -c Release -o publish - dotnet nuget push publish/BootstrapBlazor.FloatingUI.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate - - dotnet pack src/Extensions/Components/BootstrapBlazor.FontAwesome -c Release -o publish - dotnet nuget push publish/BootstrapBlazor.FontAwesome.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate - - dotnet pack src/Extensions/Components/BootstrapBlazor.Gantt -c Release -o publish - dotnet nuget push publish/BootstrapBlazor.Gantt.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate - - dotnet pack src/Extensions/Components/BootstrapBlazor.Html2Pdf -c Release -o publish - dotnet nuget push publish/BootstrapBlazor.Html2Pdf.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate - - dotnet pack src/Extensions/Components/BootstrapBlazor.Live2DDisplay -c Release -o publish - dotnet nuget push publish/BootstrapBlazor.Live2DDisplay.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate - - dotnet pack src/Extensions/Components/BootstrapBlazor.Markdown -c Release -o publish - dotnet nuget push publish/BootstrapBlazor.Markdown.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate - - dotnet pack src/Extensions/Components/BootstrapBlazor.MaterialDesign -c Release -o publish - dotnet nuget push publish/BootstrapBlazor.MaterialDesign.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate - - dotnet pack src/Extensions/Components/BootstrapBlazor.MaterialDesign.Extensions -c Release -o publish - dotnet nuget push publish/BootstrapBlazor.MaterialDesign.Extensions.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate - - dotnet pack src/Extensions/Components/BootstrapBlazor.MouseFollower -c Release -o publish - dotnet nuget push publish/BootstrapBlazor.MouseFollower.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate - - dotnet pack src/Extensions/Components/BootstrapBlazor.Splitting -c Release -o publish - dotnet nuget push publish/BootstrapBlazor.Splitting.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate - - dotnet pack src/Extensions/Components/BootstrapBlazor.SummerNote -c Release -o publish - dotnet nuget push publish/BootstrapBlazor.SummerNote.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate - - dotnet pack src/Extensions/Components/BootstrapBlazor.TableExport -c Release -o publish - dotnet nuget push publish/BootstrapBlazor.TableExport.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate - - dotnet pack src/Extensions/Components/BootstrapBlazor.Topology -c Release -o publish - dotnet nuget push publish/BootstrapBlazor.Topology.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate - - dotnet pack src/Extensions/DataServices/BootstrapBlazor.DataAccess.PetaPoco -c Release -o publish - dotnet nuget push publish/BootstrapBlazor.DataAccess.PetaPoco.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate - - dotnet pack src/Extensions/DataServices/BootstrapBlazor.DataAccess.EntityFrameworkCore -c Release -o publish - dotnet nuget push publish/BootstrapBlazor.DataAccess.EntityFrameworkCore.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate - - dotnet pack src/Extensions/DataServices/BootstrapBlazor.DataAccess.FreeSql -c Release -o publish - dotnet nuget push publish/BootstrapBlazor.DataAccess.FreeSql.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate - - dotnet pack src/Extensions/BootstrapBlazor.TagHelper -c Release -o publish - dotnet nuget push publish/BootstrapBlazor.TagHelper.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate - - dotnet pack src/Middleware/BootstrapBlazor.Middleware -c Release -o publish - dotnet nuget push publish/BootstrapBlazor.Middleware.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate diff --git a/exclusion.dic b/exclusion.dic index d5ea49ef4..06522a9a7 100644 --- a/exclusion.dic +++ b/exclusion.dic @@ -73,6 +73,7 @@ layui devui appsettings cshtml +csharp Starup args nameof diff --git a/src/BootstrapBlazor.Server/Components/Samples/CodeEditors.razor b/src/BootstrapBlazor.Server/Components/Samples/CodeEditors.razor index 7ec48585a..d58dd892c 100644 --- a/src/BootstrapBlazor.Server/Components/Samples/CodeEditors.razor +++ b/src/BootstrapBlazor.Server/Components/Samples/CodeEditors.razor @@ -3,9 +3,7 @@

@Localizer["Title"]

-
重构中 ... 稍后开放
- -@* +
@@ -37,4 +35,4 @@
- *@ + diff --git a/src/BootstrapBlazor.Server/Dockerfile b/src/BootstrapBlazor.Server/Dockerfile index 959fe6bfc..30caa651e 100644 --- a/src/BootstrapBlazor.Server/Dockerfile +++ b/src/BootstrapBlazor.Server/Dockerfile @@ -1,11 +1,11 @@ #Depending on the operating system of the host machines(s) that will build or run the containers, the image specified in the FROM statement may need to be changed. #For more information, please see https://aka.ms/containercompat -FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base +FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base WORKDIR /app EXPOSE 80 -FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build WORKDIR / COPY . . diff --git a/src/BootstrapBlazor.Server/docs.json b/src/BootstrapBlazor.Server/docs.json index 43a066423..87b91f4b5 100644 --- a/src/BootstrapBlazor.Server/docs.json +++ b/src/BootstrapBlazor.Server/docs.json @@ -128,7 +128,6 @@ "qr-code": "QRCodes", "query-builder": "QueryBuilders", "web-serial": "WebSerials", - "web-speech": "WebSpeechs", "radio": "Radios", "rate": "Rates", "reconnector": "Reconnectors", diff --git a/src/BootstrapBlazor.Server/wwwroot/css/site.css b/src/BootstrapBlazor.Server/wwwroot/css/site.css index 284484b88..23753383a 100644 --- a/src/BootstrapBlazor.Server/wwwroot/css/site.css +++ b/src/BootstrapBlazor.Server/wwwroot/css/site.css @@ -46,7 +46,7 @@ --bs-navbar-hover-color: rgb(255,255,255); } -h4, h5 { +h3, h4, h5 { margin-bottom: 1rem; }