Merge branch 'beta'

Author: dragoonDorise

.github/workflows/build-beta.yml

@@ -19,24 +19,33 @@ jobs:
 
     steps:
       - name: Checkout git repo
-        uses: actions/checkout@v1
+        uses: actions/checkout@v3
 
-      - name: Git Sumbodule Update
+      - 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@v1
+        uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version-file: .nvmrc
           cache: npm
 
       - name: Install dependencies
-        run: |
-          npm install
+        if: steps.cache-node_modules.outputs.cache-hit != 'true'
+        run: npm ci
+
       - name: Set Beta Build
         run: |
-          cp ./src/data/branch-beta.json ./src/data/branch.json
+          sed -i "s|main|beta|g" "./src/data/branch.json"
           sed -i "s|emudeck-electron|emudeck-electron-beta|g" "./package.json"
+
       - name: Publish releases
         env:
           # These values are used for auto updates signing

.github/workflows/build-dev.yml

@@ -0,0 +1,61 @@
+name: Publish
+
+on:
+  push:
+    branches:
+      - dev
+
+jobs:
+  publish:
+    # 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: [ubuntu-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: Set Dev Build
+        run: |
+          sed -i "s|main|dev|g" "./src/data/branch.json"
+
+      - 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
+          GH_TOKEN: ${{ secrets.github_token }}
+        run: |
+          npm run postinstall
+          npm run build
+          npm exec electron-builder -- --publish always --linux

.github/workflows/build.yml

@@ -19,20 +19,28 @@ jobs:
 
     steps:
       - name: Checkout git repo
-        uses: actions/checkout@v1
+        uses: actions/checkout@v3
 
-      - name: Git Sumbodule Update
+      - 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@v1
+        uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version-file: .nvmrc
           cache: npm
 
       - name: Install dependencies
-        run: |
-          npm install
+        if: steps.cache-node_modules.outputs.cache-hit != 'true'
+        run: npm ci
+
       - name: Publish releases
         env:
           # These values are used for auto updates signing

.nvmrc

@@ -0,0 +1 @@
+18

CHANGELOG.md

@@ -1,3 +1,16 @@
+# 2.0.4
+
+- FIX: Reset Config for PrimeHack and PCSX2
+- FIX: Distorted images in certain resolutions
+- FIX: Messages on PowerTools and Gyro Pages
+- FIX: Improved SD Card detection
+- FIX: Improved Backend detection
+- FIX: Compressor Tool
+- FIX: RetroAchievments
+- FIX: Powertools & GyuroDSU Installation
+- FIX: Checking for updates screen freeze
+- NEW: Appimage & installation live log
+
 # 2.0.1
 
 - FIX: Reset Config for PrimeHack and PCSX2