From 9e630efaeb6d3704d54649632876f9c4588cea37 Mon Sep 17 00:00:00 2001 From: r-q Date: Thu, 30 Jun 2022 15:03:24 +0800 Subject: [PATCH] update to 1.25 and optimize builder conf etc also optimized positive timing exp and start to support arm64 --- .github/workflows/build.yaml | 116 +++++++++++------------ package.json | 4 +- res/builder/dmgResources/background.tiff | Bin 0 -> 31638 bytes res/builder/mac.js | 15 ++- res/builder/nsis-ia32.js | 59 ------------ res/builder/nsis.js | 5 +- res/builder/win-zip-ia32.js | 44 --------- res/builder/win-zip.js | 7 +- timer.html | 2 - update.json | 26 ++--- 10 files changed, 89 insertions(+), 189 deletions(-) create mode 100644 res/builder/dmgResources/background.tiff delete mode 100644 res/builder/nsis-ia32.js delete mode 100644 res/builder/win-zip-ia32.js diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 2b62629..f429c08 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -1,63 +1,61 @@ -name: Build +name : Build -on: - [push, pull_request] +on : + [ push, pull_request ] -jobs: - build-windows: - runs-on: windows-2019 - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 - with: - node-version: 16 - cache: 'yarn' - - name: Install deps - run: yarn - - name: Build windows nsis installer - run: npm run nsis - - name: Build windows nsis installer (x86/ia32) - run: npm run nsis-ia32 - - name: Build windows 7zip protable version - run: npm run 7zip - - name: Build windows 7zip protable version (x86/ia32) - run: npm run 7zip-ia32 - - uses: actions/upload-artifact@v2 - with: - path: | - packaged/wnr-*-Setup-64.exe - packaged/wnr-*-Setup-32.exe - packaged/wnr-*-Win-64.7z - packaged/wnr-*-Win-32.7z +jobs : + build-windows : + runs-on : windows-latest + steps : + - uses : actions/checkout@v2 + - uses : actions/setup-node@v2 + with : + node-version : 16 + cache : 'yarn' + - name : Install deps + run : yarn + - name : Build windows nsis installer + run : npm run nsis + - name : Build windows 7zip protable version + run : npm run 7zip + - uses : actions/upload-artifact@v2 + with : + path : | + packaged/wnr-*-Setup-x64.exe + packaged/wnr-*-Setup-ia32.exe + packaged/wnr-*-Win-x64.7z + packaged/wnr-*-Win-ia32.7z - build-macos: - runs-on: macos-10.15 - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 - with: - node-version: 16 - cache: 'yarn' - - name: Install deps - run: yarn - - name: Build macos version - run: npm run mac - - uses: actions/upload-artifact@v2 - with: - path: packaged/wnr-*-MacOS.dmg + build-macos : + runs-on : macos-latest + steps : + - uses : actions/checkout@v2 + - uses : actions/setup-node@v2 + with : + node-version : 16 + cache : 'yarn' + - name : Install deps + run : yarn + - name : Build macos version + run : npm run mac + - uses : actions/upload-artifact@v2 + with : + path : | + packaged/wnr-*-MacOS-x64.dmg + packaged/wnr-*-MacOS-arm64.dmg - build-linux: - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 - with: - node-version: 16 - cache: 'yarn' - - name: Install deps - run: yarn - - name: Build AppImage - run: npm run appimage - - uses: actions/upload-artifact@v2 - with: - path: packaged/wnr-*-Linux.AppImage + build-linux : + runs-on : ubuntu-latest + steps : + - uses : actions/checkout@v2 + - uses : actions/setup-node@v2 + with : + node-version : 16 + cache : 'yarn' + - name : Install deps + run : yarn + - name : Build AppImage + run : npm run appimage + - uses : actions/upload-artifact@v2 + with : + path : packaged/wnr-*-Linux.AppImage diff --git a/package.json b/package.json index f6b6477..a2b8032 100644 --- a/package.json +++ b/package.json @@ -1,15 +1,13 @@ { "name": "wnr", - "version": "1.24.0", + "version": "1.25.0", "description": "Work and rest, with wnr now!", "main": "main.js", "scripts": { "dep-update": "yarn", "start": "cross-env NODE_ENV=development electron .", "nsis": "cross-env NODE_ENV=production node ./res/builder/nsis.js", - "nsis-ia32": "cross-env NODE_ENV=production node ./res/builder/nsis-ia32.js", "7zip": "cross-env NODE_ENV=portable node ./res/builder/win-zip.js", - "7zip-ia32": "cross-env NODE_ENV=portable node ./res/builder/win-zip-ia32.js", "mac": "cross-env NODE_ENV=production node ./res/builder/mac.js", "linux": "cross-env NODE_ENV=production node ./res/builder/linux.js", "appimage": "cross-env NODE_ENV=production node ./res/builder/appimage.js", diff --git a/res/builder/dmgResources/background.tiff b/res/builder/dmgResources/background.tiff new file mode 100644 index 0000000000000000000000000000000000000000..3a0e37d3b2072df504939c6f1095b9275bb15958 GIT binary patch literal 31638 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%0D-i>i9)E-jA&=GNv`^~^l+l-6Q*-c`q`9L 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 { - console.log("Done!") - }) - .catch(e => { - console.error(e) - }) \ No newline at end of file diff --git a/res/builder/nsis.js b/res/builder/nsis.js index f715bfe..67c4720 100644 --- a/res/builder/nsis.js +++ b/res/builder/nsis.js @@ -14,7 +14,8 @@ const config = { ], "target": [ { - "target": "nsis" + "target": "nsis", + "arch": ["x64", "ia32"] } ], "icon": "res/icons/iconWin.ico", @@ -38,7 +39,7 @@ const config = { "license": "LICENSE", "oneClick": false, "installerSidebar": "res/builder/nsisResources/installerSidebar.bmp", - "artifactName": "${productName}-${version}-Setup-64.${ext}", + "artifactName": "${productName}-${version}-Setup-${arch}.${ext}", "allowToChangeInstallationDirectory": true }, "publish": null diff --git a/res/builder/win-zip-ia32.js b/res/builder/win-zip-ia32.js deleted file mode 100644 index 2c83897..0000000 --- a/res/builder/win-zip-ia32.js +++ /dev/null @@ -1,44 +0,0 @@ -const builder = require('electron-builder') -const Platform = builder.Platform - -const config = { - "directories": { - "output": "packaged/" - }, - "win": { - "asarUnpack": [ - "./node_modules/node-notifier/vendor/**", - "./res/icons/**" - ], - "target": [ - { - "target": "7z", - "arch": [ - "ia32" - ] - } - ], - "icon": "res/icons/iconWin.ico", - "files": [ - "**/*", - //! to exclude - "!res/icons/*Mac*", - "!res/icons/*.psd", - "!designs/**", - "!./node_modules/node-notifier/vendor/mac.noindex/**" - ], - "artifactName": "${productName}-${version}-Win-32.${ext}" - }, - "publish": null -} - -builder.build({ - targets: Platform.WINDOWS.createTarget(), - config, -}) - .then(m => { - console.log("Done!") - }) - .catch(e => { - console.error(e) - }) \ No newline at end of file diff --git a/res/builder/win-zip.js b/res/builder/win-zip.js index 8877c51..521b768 100644 --- a/res/builder/win-zip.js +++ b/res/builder/win-zip.js @@ -13,7 +13,10 @@ const config = { "./res/icons/**" ], "target": [ - "7z" + { + "target": "7z", + "arch": ["x64", "ia32"] + } ], "icon": "res/icons/iconWin.ico", "files": [ @@ -24,7 +27,7 @@ const config = { "!designs/**", "!./node_modules/node-notifier/vendor/mac.noindex/**" ], - "artifactName": "${productName}-${version}-Win-64.${ext}" + "artifactName": "${productName}-${version}-Win-${arch}.${ext}" }, "publish": null } diff --git a/timer.html b/timer.html index be4a868..d2eac8d 100644 --- a/timer.html +++ b/timer.html @@ -378,8 +378,6 @@

//method = 3 means liberal / positive timer if (methodFromStart === 3) { $(".work").addClass("positive"); - $("#skipper-container").css("display", "none"); - $("#skipper-space").css("display", "none"); $("#bottom-bar").css("display", "none"); timingData.set("last-recorded-minutes-left", 0); diff --git a/update.json b/update.json index b657675..287c299 100644 --- a/update.json +++ b/update.json @@ -1,24 +1,24 @@ { - "version": "1.24.0", + "version": "1.25.0", "feature-introduction": false, "content": { "zh-CN": [ - "由于作者将参加高考(高中生), 6 月前将不再更新(除非特大 BUG 出现),一些之前想加的功能,因没时间先不加了。", - "带来重新设计的首页、设置页面体验,更加直观。", - "新增长休息功能(需前往设置页面来手动开启)。", - "修复了和计时、提醒、报错相关的几个 BUG,优化了数个页面的 UI 体验。" + "此版本主要解决了此前几个月由于准备考试未能解决的诸 issues 中提出的问题和功能,以及一些新发现的 bugs,并开始提供 arm64 版本的 macOS 包裹。", + "优化以下功能:统计模块、单纯计时功能、核心计时组件。", + "添加一些设置项:时间段结束后提醒的通知但不弹出模式、调节提示音音量、界面缩放、设置星期的第一天。", + "修复了以下 bugs:家长控制模式下多进程屏蔽失效、强制退出后再进入剩余时间不正确、菜单中显示或隐藏按钮在macOS上功能不正常等。" ], "zh-TW": [ - "由於作者將參加高考(高中生), 6 月前將不再更新(除非特大 BUG 出現),一些之前想加的功能,因沒時間先不加了。", - "帶來重新設計的首頁、設置頁面體驗,更加直觀。", - "新增長休息功能(需前往設置頁面來手動開啓)。", - "修復了和計時、提醒、報錯相關的幾個 BUG,優化了數個頁面的 UI 體驗。" + "此版本主要解決了此前幾個月由於準備考試未能解決的諸 issues 中提出的問題和功能,以及一些新發現的 bugs,並開始提供 arm64 版本的 macOS 包裹。", + "優化以下功能:統計模塊、單純計時功能、核心計時組件。", + "添加一些設置項:時間段結束後提醒的通知但不彈出模式、調節提示音音量、界面縮放、設置星期的第一天。", + "修復了以下 bugs:家長控制模式下多進程屏蔽失效、強制退出後再進入剩餘時間不正確、菜單中顯示或隱藏按鈕在macOS上功能不正常等。" ], "en": [ - "BUSY PREPARING FOR GAOKAO, I WILL PAUSE UPDATING THIS SOFTWARE BEFORE THIS JUNE IF THERE ARE NO BIG BUGS.", - "The newly designed index page and preferences panel.", - "Long break feature (need manual configuration in the preferences panel).", - "Several annoying bugs fixed & UI optimized." + "This version mainly solved the issues that wasn't fixed during the last semester when I was busily preparing for my exams. Also, arm64 (M1) arch of macOS is now natively supported.", + "Optimized: statistics, simple countdown mode and core timing component.", + "Updated settings panel: no pop-up mode for notifying when a period of time finishes, notify sound volume control, window zoom ratio control and changing the first day of a week.", + "Fixed several bugs related to timing, parent-control mode and macOS experience." ] }, "introduce": {