From b7854de42aca2b39c9e745dc72c9ef56255579e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9B=AE=E6=A3=83?= Date: Wed, 17 Apr 2024 17:20:39 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8D=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=E5=A4=A7=E5=B0=8F=E6=BA=A2=E5=87=BA=EF=BC=8C=E8=B0=83?= =?UTF-8?q?=E6=95=B4CI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build_signPath.yml | 9 ++----- .github/workflows/release_dev.yml | 35 ++++++++++++++-------------- lib/components/app/app_nav.dart | 5 ++-- 3 files changed, 22 insertions(+), 27 deletions(-) diff --git a/.github/workflows/build_signPath.yml b/.github/workflows/build_signPath.yml index 05339d3..0746142 100644 --- a/.github/workflows/build_signPath.yml +++ b/.github/workflows/build_signPath.yml @@ -40,16 +40,11 @@ jobs: - name: 构建项目 run: dart run msix:create --sign-msix false - - name: 安装 SignPath CLI - if: env.TOKEN != '' - shell: pwsh - run: | - Install-Module -Name SignPath -Force -AllowClobber -Scope CurrentUser - - name: SignPath 签名 if: env.TOKEN != '' shell: pwsh run: | + Install-Module -Name SignPath -Force -AllowClobber -Scope CurrentUser Submit-SigningRequest ` -InputArtifactPath "build/windows/x64/runner/Release/BangumiToday.msix" ` -ApiToken "${env:TOKEN}" ` @@ -70,7 +65,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: BTMuli.cer - path: $HOME/BTMuli.cer + path: BTMuli.cer - name: 添加Summary shell: pwsh diff --git a/.github/workflows/release_dev.yml b/.github/workflows/release_dev.yml index acafa51..b5508a4 100644 --- a/.github/workflows/release_dev.yml +++ b/.github/workflows/release_dev.yml @@ -40,32 +40,32 @@ jobs: - name: 打包msix run: dart run msix:create --sign-msix false - - name: SignPath 签名 - if: env.TOKEN != '' - shell: pwsh - run: | - Install-Module -Name SignPath -Force -AllowClobber -Scope CurrentUser - Submit-SigningRequest ` - -InputArtifactPath "build/windows/x64/runner/Release/BangumiToday.msix" ` - -ApiToken "${env:TOKEN}" ` - -OrganizationId "df493769-e8b5-461d-84a8-e9cc2071d9b2" ` - -ProjectSlug "BangumiToday" ` - -SigningPolicySlug "Dev" ` - -OutputArtifactPath "BangumiToday.msix" ` - -WaitForCompletion +# - name: SignPath 签名 +# if: env.TOKEN != '' +# shell: pwsh +# run: | +# Install-Module -Name SignPath -Force -AllowClobber -Scope CurrentUser +# Submit-SigningRequest ` +# -InputArtifactPath "build/windows/x64/runner/Release/BangumiToday.msix" ` +# -ApiToken "${env:TOKEN}" ` +# -OrganizationId "df493769-e8b5-461d-84a8-e9cc2071d9b2" ` +# -ProjectSlug "BangumiToday" ` +# -SigningPolicySlug "Dev" ` +# -OutputArtifactPath "BangumiToday.msix" ` +# -WaitForCompletion - name: 上传 MSIX if: env.TOKEN != '' uses: actions/upload-artifact@v4 with: - name: BangumiToday(SignPath).msix + name: BangumiToday(SignPath) path: BangumiToday.msix - name: 上传证书 uses: actions/upload-artifact@v4 with: name: BTMuli.cer - path: $HOME/BTMuli.cer + path: BTMuli.cer - name: 删除 msix 并打包 shell: pwsh @@ -76,13 +76,14 @@ jobs: - name: 上传打包文件 uses: actions/upload-artifact@v4 with: - name: BangumiToday.zip + name: BangumiToday path: BangumiToday.zip - name: 发行Release uses: ncipollo/release-action@v1.5.0 with: - files: | + commit: ${{ github.sha }} + artifacts: | BangumiToday.zip BTMuli.cer BangumiToday(SignPath).msix diff --git a/lib/components/app/app_nav.dart b/lib/components/app/app_nav.dart index b33499b..e9f40f5 100644 --- a/lib/components/app/app_nav.dart +++ b/lib/components/app/app_nav.dart @@ -1,7 +1,6 @@ import 'package:fluent_ui/fluent_ui.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:window_manager/window_manager.dart'; import '../../pages/app/bmf_page.dart'; @@ -81,7 +80,7 @@ class _AppNavState extends ConsumerState { PaneItem( icon: Image.asset( 'assets/images/platforms/mikan-favicon.ico', - height: 16.spMax, + height: 32, ), title: Text('Mikan'), body: MikanRSSPage(), @@ -92,7 +91,7 @@ class _AppNavState extends ConsumerState { body: ComicatRSSPage(), ), PaneItem( - icon: Image.asset('assets/images/logo.png'), + icon: Image.asset('assets/images/logo.png', height: 32), title: Text('BMF配置'), body: BmfPage(), )