Compare commits

...

2 Commits

Author SHA1 Message Date
Daniel Scalzi
2fdb217e64
Electron 16, dependency upgrade. 2022-01-23 18:37:21 -05:00
Daniel Scalzi
c1d36d2b03
Fix build with native dependencies. (#213)
Build still fails on macOS, likely because the native dependency does not support arm64. Republished the dependency with the optional native components removed to solve the problem.
2022-01-23 18:26:16 -05:00
4 changed files with 639 additions and 973 deletions

View File

@ -14,16 +14,22 @@ jobs:
- name: Check out Git repository - name: Check out Git repository
uses: actions/checkout@v1 uses: actions/checkout@v1
- name: Install Node.js, NPM and Yarn - name: Set up Node
uses: actions/setup-node@v1 uses: actions/setup-node@v1
with: with:
node-version: 16 node-version: 16
- name: Build/release Electron app - name: Set up Python
uses: samuelmeuli/action-electron-builder@v1 uses: actions/setup-python@v2
with: with:
github_token: ${{ secrets.github_token }} python-version: 3.x
# If the commit is tagged with a version (e.g. "v1.0.0"), - name: Install Dependencies
# release the app after building run: npm ci
release: ${{ startsWith(github.ref, 'refs/tags/v') }} shell: bash
- name: Build
env:
GH_TOKEN: ${{ secrets.github_token }}
run: npm run dist
shell: bash

View File

@ -1,7 +1,7 @@
// Work in progress // Work in progress
const logger = require('./loggerutil')('%c[DiscordWrapper]', 'color: #7289da; font-weight: bold') const logger = require('./loggerutil')('%c[DiscordWrapper]', 'color: #7289da; font-weight: bold')
const {Client} = require('discord-rpc') const {Client} = require('discord-rpc-patch')
let client let client
let activity let activity

1578
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -25,11 +25,11 @@
"dependencies": { "dependencies": {
"@electron/remote": "^2.0.1", "@electron/remote": "^2.0.1",
"adm-zip": "^0.5.9", "adm-zip": "^0.5.9",
"async": "^3.2.1", "async": "^3.2.3",
"discord-rpc": "^3.2.0", "discord-rpc-patch": "^4.0.1",
"ejs": "^3.1.6", "ejs": "^3.1.6",
"ejs-electron": "^2.1.1", "ejs-electron": "^2.1.1",
"electron-updater": "^4.3.9", "electron-updater": "^4.6.1",
"fs-extra": "^10.0.0", "fs-extra": "^10.0.0",
"github-syntax-dark": "^0.5.0", "github-syntax-dark": "^0.5.0",
"helios-core": "^0.1.0-alpha.3", "helios-core": "^0.1.0-alpha.3",
@ -41,9 +41,9 @@
"winreg": "^1.2.4" "winreg": "^1.2.4"
}, },
"devDependencies": { "devDependencies": {
"electron": "^15.2.0", "electron": "^16.0.7",
"electron-builder": "^22.13.1", "electron-builder": "^22.14.5",
"eslint": "^8.0.1" "eslint": "^8.7.0"
}, },
"repository": { "repository": {
"type": "git", "type": "git",