From ca1028921a06785ab719773e56d760ea70f4b573 Mon Sep 17 00:00:00 2001 From: kuaifan Date: Thu, 14 Nov 2024 23:07:07 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E7=AB=AF=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/publish.yml | 50 +++++++------- CHANGELOG.md | 12 ---- README_CLIENT.md | 25 ------- README_PUBLISH.md | 33 ++++++---- electron/build.js | 119 ++++++++++++++++++++++++---------- package.json | 4 +- resources/mobile | 2 +- 7 files changed, 133 insertions(+), 112 deletions(-) delete mode 100644 README_CLIENT.md diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index a57ed43eb..95be6bcd8 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -4,6 +4,7 @@ on: push: branches: - "pro" + - "dev" jobs: check-version: @@ -47,7 +48,7 @@ jobs: steps: - uses: actions/checkout@v4 - - name: create release + - name: Create Release id: create-release uses: actions/github-script@v7 with: @@ -229,25 +230,30 @@ jobs: run: | ./cmd electron win - # publish-release: - # needs: [check-version, create-release, build-client] - # if: needs.check-version.outputs.should_release == 'true' - # permissions: - # contents: write - # runs-on: ubuntu-latest + publish-release: + needs: [ check-version, create-release, build-client ] + if: needs.check-version.outputs.should_release == 'true' && github.ref == 'refs/heads/pro' + permissions: + contents: write + runs-on: ubuntu-latest - # steps: - # - name: publish release - # id: publish-release - # uses: actions/github-script@v7 - # env: - # RELEASE_ID: ${{ needs.create-release.outputs.release_id }} - # with: - # script: | - # github.rest.repos.updateRelease({ - # owner: context.repo.owner, - # repo: context.repo.repo, - # release_id: process.env.RELEASE_ID, - # draft: false, - # prerelease: false - # }) + steps: + - name: Publish Release + uses: actions/github-script@v7 + env: + RELEASE_ID: ${{ needs.create-release.outputs.release_id }} + with: + script: | + github.rest.repos.updateRelease({ + owner: context.repo.owner, + repo: context.repo.repo, + release_id: process.env.RELEASE_ID, + draft: false, + prerelease: false + }) + + - name: Publish Official + env: + PUBLISH_KEY: ${{ secrets.PUBLISH_KEY }} + run: | + node ./electron/build.js published diff --git a/CHANGELOG.md b/CHANGELOG.md index aef537796..e6449dc4e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,18 +2,6 @@ All notable changes to this project will be documented in this file. -## [0.40.16] - -### Performance - -- 优化客户端升级 -- 优化客户端 -- 优化签到错误提示 -- 优化图片选择器 -- 优化邮件通知 -- 优化本地资源 -- 修复iOS下载中文名乱码的问题 - ## [0.39.97] ### Bug Fixes diff --git a/README_CLIENT.md b/README_CLIENT.md deleted file mode 100644 index 65f044329..000000000 --- a/README_CLIENT.md +++ /dev/null @@ -1,25 +0,0 @@ -# 客户端说明 - -## 1、App客户端 - -#### 1.1、说明 - -目录 `resources/mobile`，使用`eeui.app`框架，遵从eeui的开发文档进行打包开发app - -#### 1.2、编译App - -1. 在项目目录执行 `./cmd appbuild [build|setting]` 编译 -2. 进入 `resources/mobile` eeui框架内打包Android或iOS应用 - - -## 2、PC/Mac客户端 - -#### 2.1、说明 - -目录 `electron`，使用`electron`框架，遵从electron的开发文档进行打包客户端 - -#### 2.2、编译客户端 - -在项目目录执行 `./cmd electron [dev]` 根据提示编译 - - diff --git a/README_PUBLISH.md b/README_PUBLISH.md index 8f34667e9..be0a42d3f 100644 --- a/README_PUBLISH.md +++ b/README_PUBLISH.md @@ -1,26 +1,31 @@ -# 发布说明 +# 发布 -## 发布前 +## 准备工作 1. 添加环境变量 `APPLEID`、`APPLEIDPASS` 用于公证 2. 添加环境变量 `CSC_LINK`、`CSC_KEY_PASSWORD` 用于签名 3. 添加环境变量 `GITHUB_TOKEN`、`GITHUB_REPOSITORY` 用于发布到GitHub（GitHub Actions 发布不需要） 4. 添加环境变量 `PUBLISH_KEY` 用于发布到私有服务器 -## 通过 GitHub Actions 发布 +## 发布版本 -1. 执行 `npm run version` 生成版本 -2. 执行 `npm run build` 编译前端 -3. 执行 `git commit` 提交并推送 -4. 等待 GitHub Actions 自动发布 +```shell +npm run translate # 翻译（可选） +npm run version # 生成版本 +npm run build # 编译前端 +``` -## 本地发布 +说明： -1. 执行 `npm run version` 生成版本 -2. 执行 `npm run build` 编译前端 -3. 执行 `./cmd electron` 相关操作 +- 执行 `npm run build` 作用是生成网页端； +- 客户端 (Windows、Mac、Android) 会通过 GitHub Actions 自动生成并发布；所以，如果要自动发布只需要提交git并推送即可； +- 如果想手动生成客户端执行 `./cmd electron` 根据提示选择操作。 -## 编译App -1. 执行 `./cmd appbuild publish` 编译 -2. 进入 `resources/mobile` eeui框架内打包Android或iOS应用 +## 编译 App + +```shell +./cmd appbuild publish # 编译生成App需要的资源 +``` + +编译完后进入 `resources/mobile` EEUI框架目录内打包 Android 或 iOS 应用（Android 以实现 GitHub Actions 自动发布） diff --git a/electron/build.js b/electron/build.js index ee5151301..b364102c4 100644 --- a/electron/build.js +++ b/electron/build.js @@ -337,6 +337,48 @@ function androidUpload(url) { }); } +/** + * 通知发布完成 + * @param url + */ +async function published(url) { + if (!PUBLISH_KEY) { + console.error("缺少 PUBLISH_KEY 环境变量"); + process.exit() + } + const spinner = ora('完成发布...').start(); + const formData = new FormData() + formData.append("action", "release"); + await axiosAutoTry({ + axios: { + method: 'post', + url: url, + data: formData, + headers: { + 'Publish-Version': config.version, + 'Publish-Key': PUBLISH_KEY, + }, + }, + retryNumber: 3 + }).then(({status, data}) => { + if (status !== 200) { + spinner.fail('发布失败, status: ' + status) + return + } + if (!utils.isJson(data)) { + spinner.fail('发布失败, not json') + return + } + if (data.ret !== 1) { + spinner.fail(`发布失败, ret ${data.ret}`) + return + } + spinner.succeed('发布完成') + }).catch(_ => { + spinner.fail('发布失败') + }) +} + /** * 通用发布 * @param url @@ -475,31 +517,29 @@ async function startBuild(data) { // if (data.id === 'app') { const eeuiDir = path.resolve(__dirname, "../resources/mobile"); - const eeuiRun = `--rm -v ${eeuiDir}:/work -w /work kuaifan/eeui-cli:0.0.1` + const eeuiRun = `docker run --rm -v ${eeuiDir}:/work -w /work kuaifan/eeui-cli:0.0.1` const publicDir = path.resolve(__dirname, "../resources/mobile/src/public"); fse.removeSync(publicDir) fse.copySync(electronDir, publicDir) if (argv[3] === "publish") { + // Android config const gradleFile = path.resolve(eeuiDir, "platforms/android/eeuiApp/local.properties") - if (fs.existsSync(gradleFile)) { - let gradleResult = fs.readFileSync(gradleFile, 'utf8') - gradleResult = gradleResult.replace(/versionCode\s*=\s*(.+?)(\n|$)/, `versionCode = ${config.codeVerson}\n`) - gradleResult = gradleResult.replace(/versionName\s*=\s*(.+?)(\n|$)/, `versionName = "${config.version}"\n`) - fs.writeFileSync(gradleFile, gradleResult, 'utf8') - } + let gradleResult = fs.existsSync(gradleFile) ? fs.readFileSync(gradleFile, 'utf8') : ""; + gradleResult = gradleResult.replace(/(versionCode|versionName)\s*=\s*(.+?)(\n|$)/g, '') + gradleResult += `versionCode = ${config.codeVerson}\nversionName = ${config.version}\n` + fs.writeFileSync(gradleFile, gradleResult, 'utf8') + // iOS config const xcconfigFile = path.resolve(eeuiDir, "platforms/ios/eeuiApp/Config/Version.xcconfig") - if (fs.existsSync(xcconfigFile)) { - let xcconfigResult = fs.readFileSync(xcconfigFile, 'utf8') - xcconfigResult = xcconfigResult.replace(/VERSION_CODE\s*=\s*(.+?)(\n|$)/, `VERSION_CODE = ${config.codeVerson}\n`) - xcconfigResult = xcconfigResult.replace(/VERSION_NAME\s*=\s*(.+?)(\n|$)/, `VERSION_NAME = ${config.version}\n`) - fs.writeFileSync(xcconfigFile, xcconfigResult, 'utf8') - } + let xcconfigResult = fs.existsSync(xcconfigFile) ? fs.readFileSync(xcconfigFile, 'utf8') : ""; + xcconfigResult = xcconfigResult.replace(/(VERSION_CODE|VERSION_NAME)\s*=\s*(.+?)(\n|$)/g, '') + xcconfigResult += `VERSION_CODE = ${config.codeVerson}\nVERSION_NAME = ${config.version}\n` + fs.writeFileSync(xcconfigFile, xcconfigResult, 'utf8') } if (['build', 'publish'].includes(argv[3])) { if (!fs.existsSync(path.resolve(eeuiDir, "node_modules"))) { - child_process.execSync(`docker run ${eeuiRun} npm install`, {stdio: "inherit", cwd: "resources/mobile"}); + child_process.execSync(`${eeuiRun} npm install`, {stdio: "inherit", cwd: "resources/mobile"}); } - child_process.execSync(`docker run ${eeuiRun} eeui build --simple`, {stdio: "inherit", cwd: "resources/mobile"}); + child_process.execSync(`${eeuiRun} eeui build --simple`, {stdio: "inherit", cwd: "resources/mobile"}); } else { [ path.resolve(publicDir, "../../platforms/ios/eeuiApp/bundlejs/eeui/public"), @@ -524,58 +564,58 @@ async function startBuild(data) { process.on('SIGINT', recoveryPackage); process.on('SIGHUP', recoveryPackage); // package.json Generated - const econfig = require('./package.json') + const appConfig = require('./package.json') let appName = utils.getDomain(data.url) if (appName === "public") appName = "DooTask" - econfig.name = data.name; - econfig.version = config.version; - econfig.build.appId = data.id; - econfig.build.artifactName = appName + "-v${version}-${os}-${arch}.${ext}"; - econfig.build.nsis.artifactName = appName + "-v${version}-${os}-${arch}.${ext}"; + appConfig.name = data.name; + appConfig.version = config.version; + appConfig.build.appId = data.id; + appConfig.build.artifactName = appName + "-v${version}-${os}-${arch}.${ext}"; + appConfig.build.nsis.artifactName = appName + "-v${version}-${os}-${arch}.${ext}"; // changelog - econfig.build.releaseInfo.releaseNotes = changeLog() + appConfig.build.releaseInfo.releaseNotes = changeLog() if (!release) { - econfig.build.releaseInfo.releaseNotes = econfig.build.releaseInfo.releaseNotes.replace(`## [${config.version}]`, `## [${config.version}-Silence]`) + appConfig.build.releaseInfo.releaseNotes = appConfig.build.releaseInfo.releaseNotes.replace(`## [${config.version}]`, `## [${config.version}-Silence]`) } // notarize if (notarize && APPLEID && APPLEIDPASS) { - econfig.build.afterSign = "./notarize.js" + appConfig.build.afterSign = "./notarize.js" } // archs if (archs.length > 0) { - econfig.build.mac.target = econfig.build.mac.target.map(target => { + appConfig.build.mac.target = appConfig.build.mac.target.map(target => { if (target.arch) target.arch = target.arch.filter(arch => archs.includes(arch)) return target }) - econfig.build.win.target = econfig.build.win.target.map(target => { + appConfig.build.win.target = appConfig.build.win.target.map(target => { if (target.arch) target.arch = target.arch.filter(arch => archs.includes(arch)) return target }) } - // github (build && publish) + // GitHub (build and publish) if (publish === true && GITHUB_TOKEN && utils.strExists(GITHUB_REPOSITORY, "/")) { const repository = GITHUB_REPOSITORY.split("/") - econfig.build.publish = { + appConfig.build.publish = { "releaseType": "release", "provider": "github", "owner": repository[0], "repo": repository[1] } - econfig.build.directories.output = `${output}-github`; - fs.writeFileSync(packageFile, JSON.stringify(econfig, null, 4), 'utf8'); + appConfig.build.directories.output = `${output}-github`; + fs.writeFileSync(packageFile, JSON.stringify(appConfig, null, 4), 'utf8'); child_process.execSync(`npm run ${platform}-publish`, {stdio: "inherit", cwd: "electron"}); } - // generic (build || publish) - econfig.build.publish = data.publish - econfig.build.directories.output = `${output}-generic`; - fs.writeFileSync(packageFile, JSON.stringify(econfig, null, 4), 'utf8'); + // generic (build or publish) + appConfig.build.publish = data.publish + appConfig.build.directories.output = `${output}-generic`; + fs.writeFileSync(packageFile, JSON.stringify(appConfig, null, 4), 'utf8'); child_process.execSync(`npm run ${platform}`, {stdio: "inherit", cwd: "electron"}); if (publish === true && PUBLISH_KEY) { genericPublish({ - url: econfig.build.publish.url, + url: appConfig.build.publish.url, key: PUBLISH_KEY, version: config.version, - output: econfig.build.directories.output + output: appConfig.build.directories.output }) } // package.json Recovery @@ -618,6 +658,13 @@ if (["dev"].includes(argv[2])) { androidUpload(publish.url) } }) +} else if (["published"].includes(argv[2])) { + // 发布完成（GitHub Actions） + config.app.forEach(async ({publish}) => { + if (publish.provider === 'generic') { + await published(publish.url) + } + }) } else if (["all", "win", "mac"].includes(argv[2])) { // 自动编译（GitHub Actions） platforms.filter(p => { diff --git a/package.json b/package.json index f9bd7f670..616501f47 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "DooTask", - "version": "0.40.16", - "codeVerson": 155, + "version": "0.39.10", + "codeVerson": 150, "description": "DooTask is task management system.", "scripts": { "start": "./cmd dev", diff --git a/resources/mobile b/resources/mobile index a1d11bf46..c5f85805d 160000 --- a/resources/mobile +++ b/resources/mobile @@ -1 +1 @@ -Subproject commit a1d11bf46fd751c1a11088a572189d0c2fb6053c +Subproject commit c5f85805ddd9f9cc36924b018a1fd779d70025fa