diff --git a/.env.example b/.env.example index ef7a67c..0a5d95e 100644 --- a/.env.example +++ b/.env.example @@ -1,6 +1,6 @@ # GitHub Personal Access Token for private repository access # Required for auto-updates from private repositories -GH_TOKEN=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 +GH_TOKEN=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 # For private repositories, you might also need: # GITHUB_TOKEN= # Alternative token name that some tools might use diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index e489447..fab6ceb 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -81,22 +81,22 @@ jobs: git push origin v${{ env.VERSION }} - name: Build for all platforms - run: pnpm build:win + run: pnpm release env: # 在 macOS 上禁用代码签名 CSC_IDENTITY_AUTO_DISCOVERY: false # GitHub token 用于发布 GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Create GitHub Release - uses: softprops/action-gh-release@v2 - with: - tag_name: v${{ env.VERSION }} - name: Release v${{ env.VERSION }} - body_path: CHANGELOG.md - draft: false - prerelease: false - files: | - release/${{ env.VERSION }}/* - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # - name: Create GitHub Release + # uses: softprops/action-gh-release@v2 + # with: + # tag_name: v${{ env.VERSION }} + # name: Release v${{ env.VERSION }} + # body_path: CHANGELOG.md + # draft: false + # prerelease: false + # files: | + # release/${{ env.VERSION }}/* + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/package.json b/package.json index a9d7b72..6a54d70 100644 --- a/package.json +++ b/package.json @@ -36,10 +36,11 @@ "lint:fix": "eslint . --ext .js,.ts,.vue --fix .", "test": "npm run build:pre && playwright test", "test:linux": "npm run build:pre && xvfb-run --auto-servernum --server-args='-screen 0, 1280x960x24' -- playwright test", - "release": "standard-version", - "release:major": "standard-version --release-as major", - "release:minor": "standard-version --release-as minor", - "release:patch": "standard-version --release-as patch" + "pub": "npm run build:pre && electron-builder --config=buildAssets/builder/config.js --windows --publish=always", + "release": "standard-version && npm run pub", + "release:major": "standard-version --release-as major && npm run pub", + "release:minor": "standard-version --release-as minor && npm run pub", + "release:patch": "standard-version --release-as patch && npm run pub" }, "standard-version": { "types": [ diff --git a/src/main/AutoUpdater.ts b/src/main/AutoUpdater.ts index 550e90b..6b9cd48 100644 --- a/src/main/AutoUpdater.ts +++ b/src/main/AutoUpdater.ts @@ -17,6 +17,14 @@ export class AutoUpdater { autoUpdater.allowPrerelease = false autoUpdater.channel = 'latest' + // 如果是私有仓库,设置认证信息 + if (process.env.GH_TOKEN || process.env.GITHUB_TOKEN) { + // 使用环境变量中的令牌 + autoUpdater.requestHeaders = { + 'Authorization': `token ${process.env.GH_TOKEN || process.env.GITHUB_TOKEN}` + } + } + // 设置事件监听器 this.setupEventListeners() }