mac build

This commit is contained in:
Jan Prochazka 2021-05-22 10:36:43 +02:00
parent 3f7caa6078
commit b151a13f65
4 changed files with 22 additions and 1 deletions

View File

@ -42,6 +42,7 @@ jobs:
if: matrix.os == 'ubuntu-18.04' if: matrix.os == 'ubuntu-18.04'
uses: samuelmeuli/action-snapcraft@v1 uses: samuelmeuli/action-snapcraft@v1
- name: Publish - name: Publish
if: matrix.os != 'macOS-10.15'
run: | run: |
yarn run build:app yarn run build:app
env: env:
@ -49,6 +50,13 @@ jobs:
WIN_CSC_LINK: ${{ secrets.WINCERT_CERTIFICATE }} WIN_CSC_LINK: ${{ secrets.WINCERT_CERTIFICATE }}
WIN_CSC_KEY_PASSWORD: ${{ secrets.WINCERT_PASSWORD }} WIN_CSC_KEY_PASSWORD: ${{ secrets.WINCERT_PASSWORD }}
- name: Publish Mac
if: matrix.os == 'macOS-10.15'
run: |
yarn run build:app:mac
env:
GH_TOKEN: ${{ secrets.GH_TOKEN }} # token for electron publish
- name: Save snap login - name: Save snap login
if: matrix.os == 'ubuntu-18.04' if: matrix.os == 'ubuntu-18.04'
run: 'echo "$SNAPCRAFT_LOGIN" > snapcraft.login' run: 'echo "$SNAPCRAFT_LOGIN" > snapcraft.login'

View File

@ -26,7 +26,10 @@
], ],
"target": { "target": {
"target": "default", "target": "default",
"arch": "x64" "arch": [
"arm64",
"x64"
]
} }
}, },
"linux": { "linux": {
@ -85,6 +88,7 @@
"start:local": "cross-env electron .", "start:local": "cross-env electron .",
"dist": "electron-builder", "dist": "electron-builder",
"build": "cd ../packages/api && yarn build && cd ../web && yarn build && cd ../../app && yarn dist", "build": "cd ../packages/api && yarn build && cd ../web && yarn build && cd ../../app && yarn dist",
"build:mac": "cd ../packages/api && yarn build && cd ../web && yarn build && cd ../../app && node setMacPlatform x64 && yarn dist && node setMacPlatform arm64 && yarn dist",
"build:local": "cd ../packages/api && yarn build && cd ../web && yarn build && cd ../../app && yarn predist", "build:local": "cd ../packages/api && yarn build && cd ../web && yarn build && cd ../../app && yarn predist",
"postinstall": "electron-builder install-app-deps && patch-package", "postinstall": "electron-builder install-app-deps && patch-package",
"predist": "copyfiles ../packages/api/dist/* packages && copyfiles \"../packages/web/public/*\" packages && copyfiles \"../packages/web/public/**/*\" packages && copyfiles --up 3 \"../plugins/dist/**/*\" packages/plugins" "predist": "copyfiles ../packages/api/dist/* packages && copyfiles \"../packages/web/public/*\" packages && copyfiles \"../packages/web/public/**/*\" packages && copyfiles --up 3 \"../plugins/dist/**/*\" packages/plugins"

8
app/setMacPlatform.js Normal file
View File

@ -0,0 +1,8 @@
const fs = require('fs');
const text = fs.readFileSync('package.json', { encoding: 'utf-8' });
const json = JSON.parse(text);
json.build.mac.target.arch = process.argv[2];
fs.writeFileSync('package.json', JSON.stringify(json, null, 2), { encoding: 'utf-8' });

View File

@ -21,6 +21,7 @@
"build:tools": "yarn workspace dbgate-tools build", "build:tools": "yarn workspace dbgate-tools build",
"build:lib": "yarn build:tools && yarn build:sqltree && yarn build:filterparser && yarn build:datalib", "build:lib": "yarn build:tools && yarn build:sqltree && yarn build:filterparser && yarn build:datalib",
"build:app": "yarn plugins:copydist && cd app && yarn install && yarn build", "build:app": "yarn plugins:copydist && cd app && yarn install && yarn build",
"build:app:mac": "yarn plugins:copydist && cd app && yarn install && yarn build:mac",
"build:api": "yarn workspace dbgate-api build", "build:api": "yarn workspace dbgate-api build",
"build:web:docker": "yarn workspace dbgate-web build", "build:web:docker": "yarn workspace dbgate-web build",
"build:plugins:frontend": "workspaces-run --only=\"dbgate-plugin-*\" -- yarn build:frontend", "build:plugins:frontend": "workspaces-run --only=\"dbgate-plugin-*\" -- yarn build:frontend",