Merge branch 'steam-deck' into amogus
This commit is contained in:
commit
621484bca1
6 changed files with 61 additions and 5 deletions
|
@ -116,10 +116,10 @@ jobs:
|
||||||
name: Move Build Files
|
name: Move Build Files
|
||||||
command: |
|
command: |
|
||||||
mkdir ~/Cider/dist/artifacts/
|
mkdir ~/Cider/dist/artifacts/
|
||||||
mv ~/Cider/dist/*.exe ~/Cider/dist/artifacts
|
|
||||||
mv ~/Cider/dist/*.deb ~/Cider/dist/artifacts
|
mv ~/Cider/dist/*.deb ~/Cider/dist/artifacts
|
||||||
mv ~/Cider/dist/*.AppImage ~/Cider/dist/artifacts
|
mv ~/Cider/dist/*.AppImage ~/Cider/dist/artifacts
|
||||||
mv ~/Cider/dist/*.snap ~/Cider/dist/artifacts
|
mv ~/Cider/dist/*.snap ~/Cider/dist/artifacts
|
||||||
|
mv ~/Cider/dist/*.exe ~/Cider/dist/artifacts
|
||||||
mv ~/Cider/dist/*.yml ~/Cider/dist/artifacts
|
mv ~/Cider/dist/*.yml ~/Cider/dist/artifacts
|
||||||
mv ~/Cider/dist/*.blockmap ~/Cider/dist/artifacts
|
mv ~/Cider/dist/*.blockmap ~/Cider/dist/artifacts
|
||||||
- store_artifacts:
|
- store_artifacts:
|
||||||
|
@ -153,6 +153,7 @@ workflows:
|
||||||
only:
|
only:
|
||||||
- main
|
- main
|
||||||
- stable
|
- stable
|
||||||
|
- steam-deck
|
||||||
- build-windows:
|
- build-windows:
|
||||||
requires:
|
requires:
|
||||||
- prepare-build
|
- prepare-build
|
||||||
|
@ -161,6 +162,7 @@ workflows:
|
||||||
only:
|
only:
|
||||||
- main
|
- main
|
||||||
- stable
|
- stable
|
||||||
|
- steam-deck
|
||||||
- build-linux:
|
- build-linux:
|
||||||
requires:
|
requires:
|
||||||
- prepare-build
|
- prepare-build
|
||||||
|
@ -169,6 +171,7 @@ workflows:
|
||||||
only:
|
only:
|
||||||
- main
|
- main
|
||||||
- stable
|
- stable
|
||||||
|
- steam-deck
|
||||||
- build-winget:
|
- build-winget:
|
||||||
requires:
|
requires:
|
||||||
- prepare-build
|
- prepare-build
|
||||||
|
@ -177,6 +180,7 @@ workflows:
|
||||||
only:
|
only:
|
||||||
- main
|
- main
|
||||||
- stable
|
- stable
|
||||||
|
- steam-deck
|
||||||
- release:
|
- release:
|
||||||
requires:
|
requires:
|
||||||
- build-windows
|
- build-windows
|
||||||
|
@ -187,3 +191,4 @@ workflows:
|
||||||
only:
|
only:
|
||||||
- main
|
- main
|
||||||
- stable
|
- stable
|
||||||
|
- steam-deck
|
||||||
|
|
1
.github/workflows/cider-chores.yml
vendored
1
.github/workflows/cider-chores.yml
vendored
|
@ -94,7 +94,6 @@ jobs:
|
||||||
commit_user_name: "cider-chore[bot]"
|
commit_user_name: "cider-chore[bot]"
|
||||||
commit_user_email: "cider-chore[bot]@users.noreply.github.com"
|
commit_user_email: "cider-chore[bot]@users.noreply.github.com"
|
||||||
|
|
||||||
|
|
||||||
synchronize-with-crowdin:
|
synchronize-with-crowdin:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
if: ${{ false }} # disable for now
|
if: ${{ false }} # disable for now
|
||||||
|
|
|
@ -36,6 +36,7 @@
|
||||||
"winget": "npm run build && electron-builder --win -c winget.json",
|
"winget": "npm run build && electron-builder --win -c winget.json",
|
||||||
"msft": "npm run build && electron-builder -c msft-package.json",
|
"msft": "npm run build && electron-builder -c msft-package.json",
|
||||||
"mstest": "npm run build && electron-builder -c msft-test.json",
|
"mstest": "npm run build && electron-builder -c msft-test.json",
|
||||||
|
"steamdeck": "npm run build && electron-builder --linux -c steam-deck.json",
|
||||||
"postinstall": "electron-builder install-app-deps",
|
"postinstall": "electron-builder install-app-deps",
|
||||||
"format:check": "npx prettier --check \"src/**/*.{js,json,ts,less}\"",
|
"format:check": "npx prettier --check \"src/**/*.{js,json,ts,less}\"",
|
||||||
"format:write": "npx prettier --write \"src/**/*.{js,json,ts,less}\""
|
"format:write": "npx prettier --write \"src/**/*.{js,json,ts,less}\""
|
||||||
|
|
|
@ -2,6 +2,7 @@ import { app, Menu, nativeImage, Tray, ipcMain, clipboard, shell } from "electro
|
||||||
import { readFileSync } from "fs";
|
import { readFileSync } from "fs";
|
||||||
import * as path from "path";
|
import * as path from "path";
|
||||||
import * as log from "electron-log";
|
import * as log from "electron-log";
|
||||||
|
import * as os from "os";
|
||||||
import { utils } from "./utils";
|
import { utils } from "./utils";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -92,6 +93,11 @@ export class AppEvents {
|
||||||
|
|
||||||
if (process.platform === "linux") {
|
if (process.platform === "linux") {
|
||||||
app.commandLine.appendSwitch("disable-features", "MediaSessionService");
|
app.commandLine.appendSwitch("disable-features", "MediaSessionService");
|
||||||
|
|
||||||
|
if (os.version().indexOf("SteamOS")) {
|
||||||
|
app.commandLine.appendSwitch("enable-features", "UseOzonePlatform");
|
||||||
|
app.commandLine.appendSwitch("ozone-platform", "x11");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/***********************************************************************************************************************
|
/***********************************************************************************************************************
|
||||||
|
|
45
steam-deck.json
Normal file
45
steam-deck.json
Normal file
|
@ -0,0 +1,45 @@
|
||||||
|
{
|
||||||
|
"electronVersion": "18.3.12",
|
||||||
|
"electronDownload": {
|
||||||
|
"version": "18.3.12+wvcus",
|
||||||
|
"mirror": "https://github.com/castlabs/electron-releases/releases/download/v"
|
||||||
|
},
|
||||||
|
"appId": "cider",
|
||||||
|
"protocols": [
|
||||||
|
{
|
||||||
|
"name": "Cider",
|
||||||
|
"schemes": ["ame", "cider", "itms", "itmss", "musics", "music"]
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"extends": null,
|
||||||
|
"files": ["**/*", "./src/**/*", "./resources/icons/icon.*"],
|
||||||
|
"linux": {
|
||||||
|
"target": ["AppImage", "flatpak", "pacman"],
|
||||||
|
"synopsis": "A new look into listening and enjoying music in style and performance. ",
|
||||||
|
"category": "AudioVideo",
|
||||||
|
"icon": "cider",
|
||||||
|
"executableName": "cider"
|
||||||
|
},
|
||||||
|
"appx": {
|
||||||
|
"applicationId": "CiderAlpha",
|
||||||
|
"publisher": "CN=CiderCollective, OID.2.25.311729368913984317654407730594956997722=1",
|
||||||
|
"displayName": "Cider",
|
||||||
|
"identityName": "CiderCollective.CiderAlpha",
|
||||||
|
"backgroundColor": "transparent",
|
||||||
|
"setBuildNumber": true
|
||||||
|
},
|
||||||
|
"win": {
|
||||||
|
"target": ["appx"],
|
||||||
|
"icon": "resources/icons/icon.ico"
|
||||||
|
},
|
||||||
|
"directories": {
|
||||||
|
"buildResources": ".",
|
||||||
|
"output": "dist"
|
||||||
|
},
|
||||||
|
"mac": {
|
||||||
|
"icon": "./resources/icons/icon.icns",
|
||||||
|
"category": "public.app-category.music",
|
||||||
|
"entitlements": "resources/entitlements.mac.plist",
|
||||||
|
"darkModeSupport": true
|
||||||
|
}
|
||||||
|
}
|
Loading…
Add table
Add a link
Reference in a new issue