diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e512ce32..47fab62b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -238,3 +238,33 @@ jobs: releaseDraft: true prerelease: false args: ${{ matrix.args }} --config release-tauri-config.json + + # 增加获取版本号 + - name: Generate release tag + id: save_tag + if: matrix.platform == 'ubuntu-24.04' + run: | + echo ${{ steps.tauri-action.outputs.appVersion }} + echo "appVersion=${{ steps.tauri-action.outputs.appVersion }}" >> $GITHUB_OUTPUT + + # 设置作业级输出 + - name: Set job output + id: set_output + if: matrix.platform == 'ubuntu-24.04' + run: | + # 注意:这里引用的是 save_tag 步骤的 tag_name 输出 + echo "appVersion=${{ steps.save_tag.outputs.appVersion }}" >> $GITHUB_OUTPUT + + upgradeLink-upload: + needs: publish-tauri # 依赖于 publish-tauri作业完成 + permissions: + contents: write + runs-on: ubuntu-latest + steps: + - name: Send a request to UpgradeLink + uses: toolsetlink/upgradelink-action@v5 + with: + source-url: 'https://github.com/HuLaSpark/HuLa/releases/download/v${{ needs.publish-tauri.outputs.appVersion }}/latest.json' + access-key: ${{ secrets.UPGRADE_LINK_ACCESS_KEY }} # ACCESS_KEY 密钥key + tauri-key: ${{ secrets.UPGRADE_LINK_TAURI_KEY }} # TAURI_KEY tauri 应用唯一标识 + github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 36d9587b..1dc312a5 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -69,6 +69,7 @@ }, "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDk1NkNENEZFNzg1MjVFMEEKUldRS1hsSjQvdFJzbGJXcnNPNXBYZ2RlTmlRRFZYYVI3YXhiWGpYZXFwVUtucThZUnJHUGw5dVUK", "endpoints": [ + "https://api.upgrade.toolsetlink.com/v1/tauri/upgrade?tauriKey=geShj8UB7zd1DyrM_YFNdg&versionName={{current_version}}&appointVersionName=&devModelKey=&devKey=&target={{target}}&arch={{arch}}", "https://gitee.com/HuLaSpark/HuLa/releases/download/latest/latest.json" ] } diff --git a/src/hooks/useCheckUpdate.ts b/src/hooks/useCheckUpdate.ts index 3b9229e2..e82f6a9b 100644 --- a/src/hooks/useCheckUpdate.ts +++ b/src/hooks/useCheckUpdate.ts @@ -22,7 +22,12 @@ export const useCheckUpdate = () => { * @param initialCheck 是否是初始检查,默认为false。初始检查时只显示强制更新提示,不显示普通更新提示 */ const checkUpdate = async (closeWin: string, initialCheck: boolean = false) => { - await check() + await check({ + timeout: 5000 /* 接口请求时长 5秒 */, + headers: { + 'X-AccessKey': 'geShj8UB7zd1DyrM_YFNdg' // UpgradeLink的AccessKey + } + }) .then(async (e) => { if (!e?.available) { return