okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

stuff

Browse source
This commit is contained in:
Core 2023-01-17 20:15:33 +00:00
parent 6ad53debe1
commit 6653f10283
No known key found for this signature in database
GPG key ID: 2AB8327FBA02D1C0
8 changed files with 17 additions and 10219 deletions
Download patch file Download diff file Expand all files Collapse all files

38
.circleci/config.yml
View file

@ -7,7 +7,6 @@ executors:
working_directory: ~/Cider
orbs: # Add orbs to your configuration
jira: circleci/jira@1.0.5 # invokes the Jira orb, making its commands accessible
gh: circleci/github-cli@2.1
# The jobs for this project
jobs:
@ -15,43 +14,20 @@ jobs:
executor: cider-ci
steps:
- checkout
- run:
name: Install and Configure PNPM
command: |
sudo npm i -g pnpm
pnpm config set store-dir ~/.pnpm-store
- run:
name: Fetch Application Version
command: ./resources/version.sh || true
- restore_cache:
key: dependency-cache-{{ checksum "pnpm-lock.yaml" }}-{{ checksum "package.json" }}
# - run:
# name: Clear cache (only if CI fails uncomment this)
# command: |
# rm -rf ~/.pnpm-store || true
# rm -rf node_modules || true
- run:
name: Clear node_airtunes2 cache
command: rm -rf ~/.pnpm-store/tmp/_tmp_1469292_a6751613e03842bf2a6fa9a4b21c3e28 || true
- run:
name: Initialize Submodules
command: git submodule update --init --recursive
- run:
name: Install Node Dependencies
command: pnpm install --frozen-lockfile
command: npm run bootstrap
- run:
name: TypeScript Compile
command: pnpm run build
- save_cache:
key: dependency-cache-{{ checksum "pnpm-lock.yaml" }}-{{ checksum "package.json" }}
paths:
- node_modules
- ~/.pnpm-store
command: npm run build
- persist_to_workspace:
# Must be an absolute path, or relative path from working_directory. This is a directory on the container which is
# taken to be the root directory of the workspace.
root: .
# Must be relative path from root
paths:
- .git
- src
@ -59,7 +35,7 @@ jobs:
- build
- resources
- package.json
- winget.json # winget.json is a file that is generated by the winget package manager
- winget.json
- LICENSE
build-linux:
@ -70,9 +46,7 @@ jobs:
at: ~/project
- run:
name: Generate Builds (Linux)
command: yarn electron-builder -l -p never
post-steps:
- jira/notify
command: h electron-builder -l -p never
- persist_to_workspace:
root: .
paths:
@ -90,8 +64,6 @@ jobs:
- run:
name: Generate Builds (Windows)
command: yarn electron-builder -w --x64 -p never
post-steps:
- jira/notify
- persist_to_workspace:
root: .
paths:
@ -108,8 +80,6 @@ jobs:
- run:
name: Generate Builds (Winget)
command: yarn electron-builder --win -c winget.json -p never
post-steps:
- jira/notify
- persist_to_workspace:
root: .
paths:

25
.github/workflows/build-macos.yml vendored
View file

@ -35,15 +35,11 @@ jobs:
fetch-depth: 0
submodules: true
- uses: pnpm/action-setup@v2.2.4
with:
version: 7
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
cache: 'pnpm'
cache: 'npm'
- name: Run Version Script
env:
@ -51,9 +47,6 @@ jobs:
run: |
sudo chmod +x resources/version.sh && ./resources/version.sh || true
- name: Clear node_airtunes2 cache
run: rm -rf ~/Library/pnpm/store/v3/tmp/cf5bc2de2629636ca224995234b8eaa1 || true
- name: Sign in to EVS
run: |
python3 -m pip install --upgrade castlabs-evs
@ -64,7 +57,7 @@ jobs:
- name: Install and Configure Node Modules
run: |
pnpm install
npm run bootstrap
cp resources/verror-types node_modules/@types/verror/index.d.ts
cp resources/macPackager.js node_modules/app-builder-lib/out/macPackager.js
rm -r node_modules/pouchdb-node/node_modules/leveldown || true
@ -80,7 +73,7 @@ jobs:
APPLE_ID_PASSWORD: ${{ secrets.APPLEIDPASS }}
PSC_NAME: ${{ secrets.PSC_NAME }}
DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer
run: pnpm dist:universalNotWorking -p never
run: npm run dist -m -p never
- name: Add license to DMG
run: npx dmg-license resources/license.json dist/*.dmg
@ -135,16 +128,4 @@ jobs:
repo_token: ${{ secrets.RELEASE_TOKEN }}
file: dist/Cider-${{ env.APP_VERSION }}-universal.pkg
tag: v${{ env.RELEASE_VERSION }}
- name: Trigger Bot Sync (main)
uses: indiesdev/curl@v1.1
with:
url: http://129.146.42.180/api/v1/github/sync/main
log-response: true
timeout: 60000
- name: Trigger Bot Sync (stable)
uses: indiesdev/curl@v1.1
with:
url: http://129.146.42.180/api/v1/github/sync/stable
log-response: true
timeout: 60000

40
.github/workflows/cider-chores.yml vendored
View file

@ -6,46 +6,6 @@ on:
- main
jobs:
update-packages:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [18]
permissions:
contents: write
steps:
- name: Checkout
uses: actions/checkout@v3
with:
# Make sure the actual branch is checked out when running on pull requests
ref: ${{ github.head_ref }}
- uses: pnpm/action-setup@v2
name: Setup pnpm 🚧
id: pnpm-install
with:
version: 7
run_install: false
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: "pnpm"
- name: Update lockfile
run: pnpm update
- name: Commit Updated Lockfile
uses: stefanzweifel/git-auto-commit-action@v4
with:
commit_message: "chore: Updated Lockfile"
commit_user_name: "cider-chore[bot]"
commit_user_email: "cider-chore[bot]@users.noreply.github.com"
prettier:
runs-on: ubuntu-latest

12
.github/workflows/dev-chores.yml vendored
View file

@ -15,25 +15,17 @@ jobs:
- name: Checkout 🛎
uses: actions/checkout@v3
- uses: pnpm/action-setup@v2
name: Setup pnpm 🚧
id: pnpm-install
with:
version: 7
run_install: false
- name: Setup node env 🏗
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}
check-latest: true
cache: 'pnpm'
- name: Install dependencies 👨🏻‍💻
run: pnpm install
run: npm run bootstrap
- name: Run linter 👀
run: pnpm format:write
run: npm run format:write
- name: Comment Suggestions 🗒️
uses: getsentry/action-git-diff-suggestions@main

5
.npmrc
View file

@ -1,5 +0,0 @@
node-linker=hoisted
public-hoist-pattern=*
shamefully-hoist=true
auto-install-peers=true
strict-peer-dependencies=false

27
package.json
View file

@ -14,30 +14,15 @@
"homepage": "https://cider.sh/",
"buildResources": "resources",
"scripts": {
"build": "tsc && npm run compile-less",
"compile-less": "lessc ./src/renderer/style.less ./src/renderer/style.css",
"start": "run-script-os",
"start:win32": "npm run build && set ELECTRON_ENABLE_LOGGING=true && electron ./build/index.js --enable-accelerated-mjpeg-decode --enable-accelerated-video --disable-gpu-driver-bug-workarounds --ignore-gpu-blacklist --enable-native-gpu-memory-buffers",
"start:linux": "npm run build && ELECTRON_ENABLE_LOGGING=true && electron ./build/index.js --enable-accelerated-mjpeg-decode --enable-accelerated-video --disable-gpu-driver-bug-workarounds --ignore-gpu-blacklist --enable-native-gpu-memory-buffers",
"start:darwin": "npm run build && ELECTRON_ENABLE_LOGGING=true && electron ./build/index.js --enable-accelerated-mjpeg-decode --enable-accelerated-video --disable-gpu-driver-bug-workarounds --ignore-gpu-blacklist --enable-native-gpu-memory-buffers",
"start-renderer": "run-script-os",
"start-renderer:win32": "set ELECTRON_ENABLE_LOGGING=true && electron ./build/index.js --enable-accelerated-mjpeg-decode --enable-accelerated-video --disable-gpu-driver-bug-workarounds --ignore-gpu-blacklist --enable-native-gpu-memory-buffers",
"start-renderer:linux": "ELECTRON_ENABLE_LOGGING=true && electron ./build/index.js --enable-accelerated-mjpeg-decode --enable-accelerated-video --disable-gpu-driver-bug-workarounds --ignore-gpu-blacklist --enable-native-gpu-memory-buffers",
"start-renderer:darwin": "ELECTRON_ENABLE_LOGGING=true && electron ./build/index.js --enable-accelerated-mjpeg-decode --enable-accelerated-video --disable-gpu-driver-bug-workarounds --ignore-gpu-blacklist --enable-native-gpu-memory-buffers",
"pack": "electron-builder --dir",
"bootstrap": "npm install --legacy-peer-deps",
"build": "tsc && lessc ./src/renderer/style.less ./src/renderer/style.css",
"start": "npm run build && electron ./build/index.js",
"dist": "npm run build && electron-builder",
"dist:macarm": "npm run build && electron-builder --mac --arm64",
"dist:linuxdir": "npm run build && electron-builder --linux dir",
"slim-build:macarm": "ditto --arch arm64 ./dist/mac-universal/Cider.app ./dist/mac-universal/arm64/Cider.app",
"slim-build:macintel": "ditto --arch x86_64 ./dist/mac-universal/Cider.app ./dist/mac-universal/x86_x64/Cider.app",
"dist:universalNotWorking": "npm run build && electron-builder --mac --universal",
"dist:all": "npm run build && electron-builder -mwl",
"testdist": "npm run build && electron-builder --dir",
"winget": "npm run build && electron-builder --win -c winget.json",
"msft": "npm run build && electron-builder -c msft-package.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",
"format:check": "npx prettier --check \"src/**/*.{js,json,ts,less}\"",
"format:write": "npx prettier --write \"src/**/*.{js,json,ts,less}\""
},
@ -45,7 +30,7 @@
"@achingbrain/ssdp": "^4.0.1",
"@sentry/electron": "^4.2.0",
"@sentry/integrations": "^7.31.1",
"adm-zip": "0.4.10",
"adm-zip": "^0.4.16",
"airtunes2": "github:ciderapp/node_airtunes2",
"castv2-client": "^1.2.0",
"chokidar": "^3.5.3",
@ -123,9 +108,9 @@
}
],
"build": {
"electronVersion": "21.2.0",
"electronVersion": "21.3.3",
"electronDownload": {
"version": "21.2.0+wvcus",
"version": "21.3.3+wvcus",
"mirror": "https://github.com/castlabs/electron-releases/releases/download/v"
},
"appId": "cider",

10085
pnpm-lock.yaml generated
View file

File diff suppressed because it is too large Load diff

4
winget.json
View file

@ -1,7 +1,7 @@
{
"electronVersion": "21.2.0",
"electronVersion": "21.3.3",
"electronDownload": {
"version": "21.2.0+wvcus",
"version": "21.3.3+wvcus",
"mirror": "https://github.com/castlabs/electron-releases/releases/download/v"
},
"appId": "cider",