Skip to content

Commit

Permalink
Merge branch 'beta'
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/renderer/components
  • Loading branch information
dragoonDorise committed Dec 5, 2023
2 parents 8a2be26 + 3907905 commit 5295bc3
Show file tree
Hide file tree
Showing 109 changed files with 946 additions and 1,378 deletions.
55 changes: 55 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,58 @@ jobs:
with:
name: EmuDeck-AppImage
path: '**/*.AppImage'
publish-windows:
# To enable auto publishing to github, update your electron publisher
# config in package.json > "build" and remove the conditional below
#if: ${{ github.repository_owner === 'electron-react-boilerplate' }}

runs-on: ${{ matrix.os }}

strategy:
matrix:
os: [macOS-latest]

steps:
- name: Checkout git repo
uses: actions/checkout@v3

- name: Git Submodule Update
run: git submodule update --init --recursive

- name: Use cached node_modules
id: cache-node_modules
uses: actions/cache@v3
with:
path: node_modules
key: ${{ runner.os }}-${{ hashFiles('package-lock.json') }}

- name: Install Node and NPM
uses: actions/setup-node@v3
with:
node-version-file: .nvmrc
cache: npm

- name: Install dependencies
if: steps.cache-node_modules.outputs.cache-hit != 'true'
run: npm ci

- name: Publish releases
env:
# These values are used for auto updates signing
#APPLE_ID: ${{ secrets.APPLE_ID }}
#APPLE_ID_PASS: ${{ secrets.APPLE_ID_PASS }}
#CSC_LINK: ${{ secrets.CSC_LINK }}
#CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
# This is used for uploading release assets to github
#npm run build:${GITHUB_REF##*/} -> Branch name
#npm exec electron-builder -- --publish always --linux --win
GH_TOKEN: ${{ secrets.github_token }}
run: |
npm run postinstall
npm run build
npm exec electron-builder -- --publish always --win --x64
- name: Upload Artifact
uses: actions/upload-artifact@v3
with:
name: EmuDeck-windows
path: '**/*.exe'
2 changes: 1 addition & 1 deletion release/app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "EmuDeck",
"version": "2.1.30",
"version": "2.1.33",
"description": "Play all your RetroGames",
"license": "MIT",
"author": {
Expand Down
Binary file added src/assets/bg-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/bg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/emulators/grid/cemu.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/emulators/grid/citra.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/emulators/grid/dolphin.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/emulators/grid/duckstation.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/emulators/grid/esde.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/emulators/grid/flycast.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/emulators/grid/mame.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/emulators/grid/melonds.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/emulators/grid/mgba.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/emulators/grid/pcsx2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/emulators/grid/pegasus.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/emulators/grid/ppsspp.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/emulators/grid/primehack.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/emulators/grid/ra.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/emulators/grid/rmg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/emulators/grid/rpcs3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/emulators/grid/ryujinx.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/emulators/grid/scummvm.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/emulators/grid/srm.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/emulators/grid/supermodel.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/emulators/grid/vita3k.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/emulators/grid/xemu.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/emulators/grid/xenia.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/emulators/grid/yuzu.png
Binary file added src/assets/emulators/pegasus.png
8 changes: 8 additions & 0 deletions src/assets/icon/checker.svg
4 changes: 4 additions & 0 deletions src/assets/icon/darwin/books.svg
4 changes: 4 additions & 0 deletions src/assets/icon/darwin/checker.svg
4 changes: 4 additions & 0 deletions src/assets/icon/darwin/cloud.svg
4 changes: 4 additions & 0 deletions src/assets/icon/darwin/compress.svg
4 changes: 4 additions & 0 deletions src/assets/icon/darwin/custom.svg
11 changes: 11 additions & 0 deletions src/assets/icon/darwin/danger.svg
4 changes: 4 additions & 0 deletions src/assets/icon/darwin/disk.svg
4 changes: 4 additions & 0 deletions src/assets/icon/darwin/doc.svg
4 changes: 4 additions & 0 deletions src/assets/icon/darwin/forbidden.svg
5 changes: 5 additions & 0 deletions src/assets/icon/darwin/gear.svg
4 changes: 4 additions & 0 deletions src/assets/icon/darwin/help.svg
4 changes: 4 additions & 0 deletions src/assets/icon/darwin/joystick.svg
4 changes: 4 additions & 0 deletions src/assets/icon/darwin/list.svg
4 changes: 4 additions & 0 deletions src/assets/icon/darwin/migrate.svg
4 changes: 4 additions & 0 deletions src/assets/icon/darwin/package.svg
4 changes: 4 additions & 0 deletions src/assets/icon/darwin/plugin.svg
Loading

0 comments on commit 5295bc3

Please sign in to comment.