Skip to content

Commit

Permalink
Merge branch '@wkazmierczak/WHIP-client' into WHIP-server
Browse files Browse the repository at this point in the history
  • Loading branch information
wkazmierczak committed Dec 3, 2024
2 parents 4c00ec7 + d1c6d77 commit bfbc59b
Show file tree
Hide file tree
Showing 321 changed files with 20,024 additions and 23,508 deletions.
23 changes: 10 additions & 13 deletions .github/workflows/demos_check.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: demos lint

on:
workflow_dispatch: {}
push:
branches: [master]
paths:
Expand All @@ -24,28 +25,24 @@ jobs:
with:
submodules: "true"

- name: Install pnpm
uses: pnpm/action-setup@v4
with:
version: 9

- name: Setup Node.js
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: "20"

- name: Cache dependencies
uses: actions/cache@v2
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-
${{ runner.os }}-
- name: Install project dependencies
working-directory: ./demos
run: npm ci
run: pnpm install --frozen-lockfile

- name: Lint code
working-directory: ./demos
run: npm run lint
run: pnpm run lint

- name: Typecheck code
working-directory: ./demos
run: npm run typecheck
run: pnpm run typecheck
7 changes: 0 additions & 7 deletions .github/workflows/deploy_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,6 @@ name: deploy to gh-pages

on:
workflow_dispatch: {}
push:
branches: [master]
paths:
- "docs/**"
- "schemas/**"
- "generate/src/bin/generate_from_types/**"
- ".github/workflows/deploy_docs.yml"

permissions:
contents: write
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
name: lint
on:
workflow_dispatch: {}
push:
branches: [master]
pull_request:
Expand Down Expand Up @@ -29,6 +30,11 @@ jobs:
with:
components: rustfmt, clippy

- name: Install pnpm
uses: pnpm/action-setup@v4
with:
version: 9

- name: 🛠 Setup Node.JS
uses: actions/setup-node@v4
with:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/macos_lint.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
name: macos lint
on:
workflow_dispatch: {}
push:
branches: [master]
pull_request:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/shellcheck.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
name: shellcheck
on:
workflow_dispatch: {}
push:
branches: [master]
paths:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
name: build and test
on:
workflow_dispatch: {}
push:
branches: [master]
pull_request:
Expand Down
34 changes: 16 additions & 18 deletions .github/workflows/ts_sdk_check.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
name: TS SDK check

on:
workflow_dispatch: {}
push:
branches: [master]
paths:
- "ts/**"
pull_request:
types: [opened, synchronize]
paths:
- "ts/**"

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand All @@ -22,32 +19,33 @@ jobs:
- name: Checkout repo
uses: actions/checkout@v2

- name: Setup Node.js
uses: actions/setup-node@v2
- name: 🔧 Install the rust toolchain
uses: dtolnay/rust-toolchain@stable
with:
node-version: "20"
toolchain: 1.81.0

- name: Install pnpm
uses: pnpm/action-setup@v4
with:
version: 9

- name: Cache dependencies
uses: actions/cache@v2
- name: Setup Node.js
uses: actions/setup-node@v4
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-
${{ runner.os }}-
node-version: "20"

- name: Install project dependencies
working-directory: ./ts
run: npm install
run: pnpm install --frozen-lockfile

- name: Build
working-directory: ./ts
run: npm run build:all
run: pnpm run build:all

- name: Lint code
working-directory: ./ts
run: npm run lint
run: pnpm run lint

- name: Typecheck code
working-directory: ./ts
run: npm run typecheck
run: pnpm run typecheck
1 change: 1 addition & 0 deletions .github/workflows/wasm.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
name: wasm build
on:
workflow_dispatch: {}
push:
branches: [master]
pull_request:
Expand Down
10 changes: 9 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,13 @@
"url": "./schemas/scene.schema.json"
}
],
"eslint.workingDirectories": [{ "mode": "auto" }]
"eslint.workingDirectories": [
{ "directory": "./demos", "changeProcessCWD": true },
{ "directory": "./ts", "changeProcessCWD": true },
{ "directory": "./docs", "changeProcessCWD": true }
],
"prettier.requireConfig": true,
"prettier.configPath": "",
"editor.formatOnSave": true,
"editor.defaultFormatter": "esbenp.prettier-vscode"
}
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
### ✨ New features

- Add `loop` option for MP4 input. ([#699](https://github.com/software-mansion/live-compositor/pull/699) by [@WojciechBarczynski](https://github.com/WojciechBarczynski))
- Add `LIVE_COMPOSITOR_LOG_FILE` environment variable to enable logging to file ([#853](https://github.com/software-mansion/live-compositor/pull/853) by [@wkozyra95](https://github.com/wkozyra95))
- Add border, border radius and box shadow options to `Rescaler` and `View` components. ([#815](https://github.com/software-mansion/live-compositor/pull/815) by [@WojciechBarczynski](https://github.com/WojciechBarczynski), ([#839](https://github.com/software-mansion/live-compositor/pull/839), [#842](https://github.com/software-mansion/live-compositor/pull/842), [#858](https://github.com/software-mansion/live-compositor/pull/858) by [@wkozyra95](https://github.com/wkozyra95))


### 🐛 Bug fixes

Expand Down
Loading

0 comments on commit bfbc59b

Please sign in to comment.