Skip to content
This repository has been archived by the owner on Dec 14, 2024. It is now read-only.

Electron update #32

Merged
merged 11 commits into from
Jul 27, 2024
Merged

Electron update #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7457674
:arrow_up: Upgrade dependencies
OmegaRogue Jun 11, 2024
9d77cc3
github-actions[bot] Jun 11, 2024
0f2ae1b
:arrow_down: Downgrade electronforge vite plugin to fix build issues
OmegaRogue Jun 11, 2024
db95fee
github-actions[bot] Jun 11, 2024
430453b
:apple: Debug macos CI build
OmegaRogue Jun 11, 2024
bf62fcf
github-actions[bot] Jun 11, 2024
7de7cc3
:apple: Debug macos CI build
OmegaRogue Jun 11, 2024
4bf63c0
github-actions[bot] Jun 11, 2024
bbbc25c
:apple: Fix builds for apple silicon
OmegaRogue Jun 11, 2024
c488789
github-actions[bot] Jun 11, 2024
5e98e63
Merge branch 'main' into pull-request-no-injection
OmegaRogue Jul 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,16 +81,16 @@ jobs:

- name: Rename output files
run: |
mv out/make/zip/darwin/x64/vtt-desktop-client-darwin-x64-${{ github.event.release.tag_name }}.zip ./vtt-desktop-client-macos-x64-${{ github.event.release.tag_name }}.zip
mv out/make/vtt-desktop-client-${{ github.event.release.tag_name }}-x64.dmg ./vtt-desktop-client-${{ github.event.release.tag_name }}-x64.dmg
mv out/make/zip/darwin/arm64/vtt-desktop-client-darwin-arm64-${{ github.event.release.tag_name }}.zip ./vtt-desktop-client-macos-arm64-${{ github.event.release.tag_name }}.zip
mv out/make/vtt-desktop-client-${{ github.event.release.tag_name }}-arm64.dmg ./vtt-desktop-client-${{ github.event.release.tag_name }}-x64.dmg

- name: Archive production artifacts
uses: actions/upload-artifact@v2
with:
name: macos-outputs
path: |
vtt-desktop-client-macos-x64-${{ github.event.release.tag_name }}.zip
vtt-desktop-client-${{ github.event.release.tag_name }}-x64.dmg
vtt-desktop-client-macos-arm64-${{ github.event.release.tag_name }}.zip
vtt-desktop-client-${{ github.event.release.tag_name }}-arm64.dmg

build-windows:
runs-on: windows-latest
Expand Down
33 changes: 17 additions & 16 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,24 +19,25 @@
}
],
"devDependencies": {
"@electron-forge/cli": "^7.2.0",
"@electron-forge/maker-deb": "^7.2.0",
"@electron-forge/maker-dmg": "^7.2.0",
"@electron-forge/maker-flatpak": "^7.2.0",
"@electron-forge/maker-rpm": "^7.2.0",
"@electron-forge/maker-squirrel": "^7.2.0",
"@electron-forge/maker-zip": "^7.2.0",
"@electron-forge/plugin-auto-unpack-natives": "^7.2.0",
"@electron-forge/plugin-vite": "^7.2.0",
"@types/node": "^20.11.5",
"@typescript-eslint/eslint-plugin": "^6.19.0",
"@typescript-eslint/parser": "^6.19.0",
"electron": "^25.9.8",
"electron-builder": "^24.9.1",
"eslint": "^8.56.0",
"@electron-forge/cli": "^7.4.0",
"@electron-forge/maker-deb": "^7.4.0",
"@electron-forge/maker-dmg": "^7.4.0",
"@electron-forge/maker-flatpak": "^7.4.0",
"@electron-forge/maker-rpm": "^7.4.0",
"@electron-forge/maker-squirrel": "^7.4.0",
"@electron-forge/maker-zip": "^7.4.0",
"@electron-forge/plugin-auto-unpack-natives": "^7.4.0",
"@electron-forge/plugin-vite": "7.2.0",
"@types/node": "^20.14.2",
"@typescript-eslint/eslint-plugin": "^7.13.0",
"@typescript-eslint/parser": "^7.13.0",
"electron": "^29.4.2",
"electron-builder": "^24.13.3",
"eslint": "^8.57.0",
"eslint-plugin-import": "^2.29.1",
"ts-node": "^10.9.2",
"typescript": "^5.3.3"
"typescript": "^5.4.5",
"vite": "^5.2.13"
},
"scripts": {
"start": "electron-forge start",
Expand Down
Loading