Scarfski/dootask
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
kuaifan
2022-04-18 21:09:36 +08:00
parent 7b3d9d9402
commit cb3174f7d8
11 changed files with 85 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
.github/workflows/electron-generic.yml vendored
View File

@@ -7,6 +7,10 @@ on:
jobs:
build-mac:
strategy:
fail-fast: false
matrix:
id: [ "com.dootask.task", "com.hitosea.task" ]
runs-on: macos-latest
environment: build
@@ -27,17 +31,22 @@ jobs:
with:
node-version: 16.x
- name: Build for MacOS
- name: Build for MacOS ${{ matrix.id }}
env:
APPID: ${{ matrix.id }}
PROVIDER: "generic"
APPLEID: ${{ secrets.APPLEID }}
APPLEIDPASS: ${{ secrets.APPLEIDPASS }}
CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
CSC_LINK: ${{ secrets.CSC_LINK }}
PROVIDER: "generic"
RELEASE_BODY: ${{ steps.changelog.outputs.changes }}
run: ./cmd electron build-mac
build-win:
strategy:
fail-fast: false
matrix:
id: [ "com.dootask.task", "com.hitosea.task" ]
runs-on: windows-latest
environment: build
@@ -58,9 +67,10 @@ jobs:
with:
node-version: 16.x
- name: Build for Windows
- name: Build for Windows ${{ matrix.id }}
shell: powershell
env:
APPID: ${{ matrix.id }}
PROVIDER: "generic"
RELEASE_BODY: ${{ steps.changelog.outputs.changes }}
run: |

24
.github/workflows/electron-main.yml → .github/workflows/electron-github.yml vendored
View File

@@ -1,4 +1,4 @@
name: Build Main
name: Build Github
on:
push:
@@ -9,7 +9,7 @@ jobs:
release:
runs-on: ubuntu-latest
if: ${{ (startsWith(github.event.ref, 'refs/tags/v')) && (github.repository == 'kuaifan/kkFileView') }}
if: ${{ (startsWith(github.event.ref, 'refs/tags/v')) && (github.repository == 'kuaifan/dootask') }}
steps:
- name: Checkout
uses: actions/checkout@v2
@@ -31,10 +31,14 @@ jobs:
body: ${{ steps.changelog.outputs.changes }}
build-mac:
strategy:
fail-fast: false
matrix:
id: [ "com.dootask.task", "com.hitosea.task" ]
runs-on: macos-latest
environment: build
if: ${{ (startsWith(github.event.ref, 'refs/tags/v')) && (github.repository == 'kuaifan/kkFileView') }}
if: ${{ (startsWith(github.event.ref, 'refs/tags/v')) && (github.repository == 'kuaifan/dootask') }}
steps:
- name: Checkout
uses: actions/checkout@v2
@@ -44,8 +48,10 @@ jobs:
with:
node-version: 16.x
- name: Build for MacOS
- name: Build for MacOS ${{ matrix.id }}
env:
APPID: ${{ matrix.id }}
PROVIDER: "github"
APPLEID: ${{ secrets.APPLEID }}
APPLEIDPASS: ${{ secrets.APPLEIDPASS }}
CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
@@ -55,10 +61,14 @@ jobs:
run: ./cmd electron build-mac
build-win:
strategy:
fail-fast: false
matrix:
id: [ "com.dootask.task", "com.hitosea.task" ]
runs-on: windows-latest
environment: build
if: ${{ (startsWith(github.event.ref, 'refs/tags/v')) && (github.repository == 'kuaifan/kkFileView') }}
if: ${{ (startsWith(github.event.ref, 'refs/tags/v')) && (github.repository == 'kuaifan/dootask') }}
steps:
- name: Checkout
uses: actions/checkout@v2
@@ -68,9 +78,11 @@ jobs:
with:
node-version: 16.x
- name: Build for Windows
- name: Build for Windows ${{ matrix.id }}
shell: powershell
env:
APPID: ${{ matrix.id }}
PROVIDER: "github"
GH_TOKEN: ${{ secrets.GH_PAT }}
EP_PRE_RELEASE: true
run: |

16
electron/build.js vendored
View File

@@ -69,8 +69,6 @@ function genericPublish(url, version) {
uploadOra.succeed(`${filename} upload successful`)
}).catch(_ => {
uploadOra.fail(`${filename} upload fail`)
}).finally(_ => {
fse.removeSync(localFile)
})
}
}
@@ -140,13 +138,13 @@ if (["dev"].includes(argv[2])) {
child_process.spawn("npm", ["run", "start-quiet"], {stdio: "inherit", cwd: "electron"});
} else if (platform.includes(argv[2])) {
// 自动编译
let provider = process.env.PROVIDER === "generic" ? "generic" : "github"
config.app.forEach(data => {
if (data.publish.provider === provider) {
data.platform = argv[2];
startBuild(data, true)
}
})
let data = config.app.find(({id, publish}) => id === process.env.APPID && publish.provider === process.env.PROVIDER);
if (data) {
data.platform = argv[2];
startBuild(data, true)
} else {
console.warn("not build appid!");
}
} else {
// 自定义编译
let appChoices = [];

80
package.json
View File

@@ -1,50 +1,12 @@
{
"name": "DooTask",
"version": "0.13.38",
"version": "0.13.41",
"description": "DooTask is task management system.",
"scripts": {
"start": "./cmd dev",
"build": "./cmd prod",
"version": "node ./version.js"
},
"app": [
{
"name": "DooTask",
"id": "com.dootask.task",
"url": "https://dootask.com/",
"urls": [
"https://dootask.com/",
"https://www.dootask.com/"
],
"publish": {
"provider": "github",
"owner": "kuaifan",
"repo": "dootask"
}
},
{
"name": "DooTask",
"id": "com.dootask.task",
"url": "https://dootask.com/",
"urls": [
"https://dootask.com/",
"https://www.dootask.com/"
],
"publish": {
"provider": "generic",
"url": "https://dootask.com/desktop/publish"
}
},
{
"name": "HitoseaTask",
"id": "com.hitosea.task",
"url": "https://t.hitosea.com/",
"publish": {
"provider": "generic",
"url": "https://t.hitosea.com/desktop/publish"
}
}
],
"author": {
"name": "KuaiFan",
"email": "aipaw@live.cn",
@@ -95,5 +57,43 @@
"vuex": "^3.6.2",
"webpack": "^5.69.1",
"webpack-cli": "^4.9.2"
}
},
"app": [
{
"id": "com.dootask.task",
"name": "DooTask",
"url": "https://dootask.com/",
"urls": [
"https://dootask.com/",
"https://www.dootask.com/"
],
"publish": {
"provider": "github",
"owner": "kuaifan",
"repo": "dootask"
}
},
{
"id": "com.dootask.task",
"name": "DooTask",
"url": "https://dootask.com/",
"urls": [
"https://dootask.com/",
"https://www.dootask.com/"
],
"publish": {
"provider": "generic",
"url": "https://dootask.com/desktop/publish"
}
},
{
"id": "com.hitosea.task",
"name": "HitoseaTask",
"url": "https://t.hitosea.com/",
"publish": {
"provider": "generic",
"url": "https://t.hitosea.com/desktop/publish"
}
}
]
}

2
public/js/app.js vendored
View File

File diff suppressed because one or more lines are too long

4
public/js/build/699.js → public/js/build/488.js vendored
View File

File diff suppressed because one or more lines are too long

0
public/js/build/699.js.LICENSE.txt → public/js/build/488.js.LICENSE.txt
View File

4
public/js/build/607.js → public/js/build/596.js vendored
View File

File diff suppressed because one or more lines are too long

0
public/js/build/607.js.LICENSE.txt → public/js/build/596.js.LICENSE.txt
View File

2
public/js/build/470.js → public/js/build/845.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/js/hash
View File

@@ -1 +1 @@
964ec56060e5c9b0
226c47835bddc9c6