Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into beanow/hack-instrumen…
Browse files Browse the repository at this point in the history
…tation

# Conflicts:
#	clients/web/src/components/calls/calls-list.tsx
#	clients/web/src/components/calls/detail/call-detail-args.tsx
#	clients/web/src/components/calls/detail/call-detail-trace.tsx
#	clients/web/src/components/calls/detail/call-detail.tsx
#	clients/web/src/components/calls/tool-bar/calls-scale-slider.tsx
#	clients/web/src/components/calls/tool-bar/sort-caret.tsx
#	clients/web/src/components/calls/topbar/calls-scale-slider.tsx
#	clients/web/src/components/calls/topbar/sort-caret.tsx
#	clients/web/src/components/health-status.tsx
#	clients/web/src/components/span/sort-caret.tsx
#	clients/web/src/components/span/span-scale-slider.tsx
#	clients/web/src/lib/connection/monitor.ts
#	clients/web/src/lib/connection/transport.tsx
#	clients/web/src/lib/span/filter-spans.ts
#	clients/web/src/lib/span/format-span.ts
#	clients/web/src/lib/span/get-event-name.ts
#	clients/web/src/lib/span/get-ipc-request-name.ts
#	clients/web/src/lib/span/get-ipc-request-value.ts
#	clients/web/src/lib/span/get-span-kind.ts
#	clients/web/src/lib/span/is-event-span.ts
#	clients/web/src/lib/span/update-spans.ts
#	clients/web/src/views/dashboard/calls.tsx
#	clients/web/tests/store/span-waterfall.test.ts
  • Loading branch information
johann-crabnebula committed May 2, 2024
2 parents b8c9034 + 20e9e34 commit 76b8842
Show file tree
Hide file tree
Showing 21 changed files with 659 additions and 926 deletions.
20 changes: 12 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,14 @@ jobs:
components: rustfmt
- run: cargo fmt --all -- --check

check-licenses:
cargo-deny:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Check Rust Code
uses: EmbarkStudios/cargo-deny-action@v1

check-js-licenses:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand All @@ -111,16 +118,13 @@ jobs:
uses: actions/setup-node@v4
with:
node-version: 20
cache: 'pnpm'
cache-dependency-path: 'clients/web/pnpm-lock.yaml'
cache: "pnpm"
cache-dependency-path: "clients/web/pnpm-lock.yaml"
- name: Install dependencies
run: pnpm install -g license-checker
- name: Check JavaScript Licenses
working-directory: clients/web
run: license-checker --summary --onlyAllow="MIT;Apache-2.0;BSD-2-Clause" --excludePackages="[email protected]"
- name: Check Rust Licenses
uses: EmbarkStudios/cargo-deny-action@v1

run: license-checker --summary --onlyAllow="MIT;Apache-2.0;BSD-2-Clause" --excludePackages="[email protected]"
# outdated:
# name: Outdated
# runs-on: ubuntu-latest
Expand All @@ -129,4 +133,4 @@ jobs:
# steps:
# - uses: actions/checkout@v3
# - uses: dtolnay/install@cargo-outdated
# - run: cargo outdated --workspace --exit-code 1
# - run: cargo outdated --workspace --exit-code 1
Loading

0 comments on commit 76b8842

Please sign in to comment.