Skip to content

Commit 4c062ef

Browse files
committed
2.0.38 RC
# Conflicts: # release/app/package.json # src/renderer/components # src/renderer/pages/EndPage.js
2 parents 9151ab8 + 9b6be13 commit 4c062ef

File tree

353 files changed

+36136
-8307
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

353 files changed

+36136
-8307
lines changed

.editorconfig

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
root = true
22

3+
[*.md]
4+
trim_trailing_whitespace = false
5+
6+
37
[*]
4-
indent_style = space
5-
indent_size = 2
6-
end_of_line = lf
78
charset = utf-8
8-
trim_trailing_whitespace = true
99
insert_final_newline = true
10-
11-
[*.md]
12-
trim_trailing_whitespace = false
10+
end_of_line = lf
11+
indent_style = spaces
12+
indent_size = 2
13+
max_line_length = 80
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
name: PR Auto-build
2+
3+
on:
4+
pull_request:
5+
types: [labeled]
6+
pull_request_review:
7+
types: [submitted]
8+
9+
jobs:
10+
publish-linux:
11+
12+
runs-on: ${{ matrix.os }}
13+
14+
strategy:
15+
matrix:
16+
os: [ubuntu-latest]
17+
18+
steps:
19+
- name: Checkout git repo
20+
uses: actions/checkout@v3
21+
22+
- name: Git Submodule Update
23+
run: git submodule update --init --recursive
24+
25+
- name: Use cached node_modules
26+
id: cache-node_modules
27+
uses: actions/cache@v3
28+
with:
29+
path: node_modules
30+
key: ${{ runner.os }}-${{ hashFiles('package-lock.json') }}
31+
32+
- name: Install Node and NPM
33+
uses: actions/setup-node@v3
34+
with:
35+
node-version-file: .nvmrc
36+
cache: npm
37+
38+
- name: Install dependencies
39+
if: steps.cache-node_modules.outputs.cache-hit != 'true'
40+
run: npm ci
41+
42+
- name: Set Beta Build
43+
run: |
44+
sed -i "s|main|beta|g" "./src/data/branch.json"
45+
sed -i "s|emudeck-electron|emudeck-electron-beta|g" "./package.json"
46+
47+
- name: build releases
48+
run: |
49+
npm run postinstall
50+
npm run build
51+
npm exec electron-builder --linux
52+
53+
- name: Upload Artifact
54+
uses: actions/upload-artifact@v3
55+
with:
56+
name: EmuDeck-Beta-AppImage
57+
path: '**/*.AppImage'

.github/workflows/build-beta.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
steps:
2121
- name: Checkout git repo
2222
uses: actions/checkout@v3
23-
23+
2424
- name: Git Submodule Update
2525
run: git submodule update --init --recursive
2626

@@ -47,6 +47,7 @@ jobs:
4747
sed -i "s|emudeck-electron|emudeck-electron-beta|g" "./package.json"
4848
#sed -i "s|EmuDeck|EmuDeck-beta|g" "./release/app/package.json"
4949
#sed -i 's|"productName": "EmuDeck"|"productName": "EmuDeck-beta"|g' "./package.json"
50+
5051
- name: Publish releases
5152
env:
5253
# These values are used for auto updates signing
@@ -62,6 +63,12 @@ jobs:
6263
npm run postinstall
6364
npm run build
6465
npm exec electron-builder -- --publish always --linux
66+
67+
- name: Upload Artifact
68+
uses: actions/upload-artifact@v3
69+
with:
70+
name: EmuDeck-Beta-AppImage
71+
path: '**/*.AppImage'
6572

6673
publish-windows:
6774
# To enable auto publishing to github, update your electron publisher

.github/workflows/build-early.yml

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
name: Publish
2+
3+
on:
4+
push:
5+
branches:
6+
- early
7+
8+
jobs:
9+
publish-linux:
10+
# To enable auto publishing to github, update your electron publisher
11+
# config in package.json > "build" and remove the conditional below
12+
#if: ${{ github.repository_owner == 'electron-react-boilerplate' }}
13+
14+
runs-on: ${{ matrix.os }}
15+
16+
strategy:
17+
matrix:
18+
os: [ubuntu-latest]
19+
20+
steps:
21+
- name: Checkout git repo
22+
uses: actions/checkout@v3
23+
24+
- name: Git Submodule Update
25+
run: git submodule update --init --recursive
26+
27+
- name: Use cached node_modules
28+
id: cache-node_modules
29+
uses: actions/cache@v3
30+
with:
31+
path: node_modules
32+
key: ${{ runner.os }}-${{ hashFiles('package-lock.json') }}
33+
34+
- name: Install Node and NPM
35+
uses: actions/setup-node@v3
36+
with:
37+
node-version-file: .nvmrc
38+
cache: npm
39+
40+
- name: Install dependencies
41+
if: steps.cache-node_modules.outputs.cache-hit != 'true'
42+
run: npm ci
43+
44+
- name: Set Early Build
45+
run: |
46+
sed -i "s|main|early|g" "./src/data/branch.json"
47+
sed -i "s|emudeck-electron|emudeck-electron-early|g" "./package.json"
48+
#sed -i "s|EmuDeck|EmuDeck-early|g" "./release/app/package.json"
49+
#sed -i 's|"productName": "EmuDeck"|"productName": "EmuDeck-early"|g' "./package.json"
50+
51+
- name: Publish releases
52+
env:
53+
# These values are used for auto updates signing
54+
#APPLE_ID: ${{ secrets.APPLE_ID }}
55+
#APPLE_ID_PASS: ${{ secrets.APPLE_ID_PASS }}
56+
#CSC_LINK: ${{ secrets.CSC_LINK }}
57+
#CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
58+
# This is used for uploading release assets to github
59+
#npm run build:${GITHUB_REF##*/} -> Branch name
60+
#npm exec electron-builder -- --publish always --linux --win
61+
GH_TOKEN: ${{ secrets.github_token }}
62+
run: |
63+
npm run postinstall
64+
npm run build
65+
npm exec electron-builder -- --publish always --linux
66+
67+
- name: Upload Artifact
68+
uses: actions/upload-artifact@v3
69+
with:
70+
name: EmuDeck-Early-AppImage
71+
path: '**/*.AppImage'
72+
73+
publish-windows:
74+
# To enable auto publishing to github, update your electron publisher
75+
# config in package.json > "build" and remove the conditional below
76+
#if: ${{ github.repository_owner == 'electron-react-boilerplate' }}
77+
78+
runs-on: ${{ matrix.os }}
79+
80+
strategy:
81+
matrix:
82+
os: [macOS-latest]
83+
84+
steps:
85+
- name: Checkout git repo
86+
uses: actions/checkout@v3
87+
88+
- name: Git Submodule Update
89+
run: git submodule update --init --recursive
90+
91+
- name: Use cached node_modules
92+
id: cache-node_modules
93+
uses: actions/cache@v3
94+
with:
95+
path: node_modules
96+
key: ${{ runner.os }}-${{ hashFiles('package-lock.json') }}
97+
98+
- name: Install Node and NPM
99+
uses: actions/setup-node@v3
100+
with:
101+
node-version-file: .nvmrc
102+
cache: npm
103+
104+
- name: Install dependencies
105+
if: steps.cache-node_modules.outputs.cache-hit != 'true'
106+
run: npm ci
107+
108+
- name: Set Early Build
109+
run: |
110+
sed -i'.original' -e "s|main|early|g" "./src/data/branch.json"
111+
sed -i'.original' -e "s|emudeck-electron|emudeck-electron-early|g" "./package.json"
112+
#sed -i'.original' -e "s|EmuDeck|EmuDeck-early|g" "./release/app/package.json"
113+
#sed -i'.original' -e 's|"productName": "EmuDeck"|"productName": "EmuDeck-early"|g' "./package.json"
114+
- name: Publish releases
115+
env:
116+
# These values are used for auto updates signing
117+
#APPLE_ID: ${{ secrets.APPLE_ID }}
118+
#APPLE_ID_PASS: ${{ secrets.APPLE_ID_PASS }}
119+
#CSC_LINK: ${{ secrets.CSC_LINK }}
120+
#CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
121+
# This is used for uploading release assets to github
122+
#npm run build:${GITHUB_REF##*/} -> Branch name
123+
#npm exec electron-builder -- --publish always --linux --win
124+
GH_TOKEN: ${{ secrets.github_token }}
125+
run: |
126+
npm run postinstall
127+
npm run build
128+
npm exec electron-builder -- --publish always --win

.prettierrc.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"printWidth": 120,
3+
"tabWidth": 2,
4+
"useTabs": false,
5+
"semi": true,
6+
"quoteProps": "as-needed",
7+
"trailingComma": "es5",
8+
"bracketSpacing": true,
9+
"jsxBracketSameLine": true,
10+
"arrowParens": "always",
11+
"proseWrap": "preserve",
12+
"htmlWhitespaceSensitivity": "css"
13+
}

.vscode/extensions.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
11
{
2-
"recommendations": ["dbaeumer.vscode-eslint", "EditorConfig.EditorConfig"]
2+
"recommendations": [
3+
"EditorConfig.EditorConfig",
4+
"dbaeumer.vscode-eslint",
5+
"eamodio.gitlens",
6+
"esbenp.prettier-vscode"
7+
]
38
}

README.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
# EmuDeck
2+
23
[![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-908a85?logo=gitpod)](https://gitpod.io/from-referrer/)
34
<img src="https://www.emudeck.com/img/hero.png">
45

56
EmuDeck is a collection of scripts that allows you to autoconfigure your Steam Deck, it creates your roms directory structure and downloads all of the needed Emulators for you along with the best configurations for each of them. EmuDeck works great with [Steam Rom Manager](https://github.com/SteamGridDB/steam-rom-manager) or with [EmulationStation DE](https://es-de.org)
67

7-
8-
98
# Developers, developers, developers.
109

1110
We're not currently accepting PR on the new Electron GUI since is still in its early stages, we will accept PR later on the future!
11+
12+
# Open Emoji
13+
14+
All emojis designed by [OpenMoji](https://openmoji.org/) – the open-source emoji and icon project. License: [CC BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/#)

0 commit comments

Comments
 (0)