Skip to content

Commit

Permalink
Merge branch 'mavlink:master' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
joaoantoniocardoso committed Jun 28, 2024
2 parents ddee2a2 + 9f6bdf0 commit 1c3367f
Show file tree
Hide file tree
Showing 87 changed files with 767 additions and 285 deletions.
9 changes: 4 additions & 5 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ jobs:
packages: |
libunwind-dev \
libclang-dev \
libssl-dev \
pkg-config \
build-essential \
curl \
Expand All @@ -40,7 +39,7 @@ jobs:
with:
node-version: '20'
# cache: 'yarn'
# cache-dependency-path: 'src/stream/webrtc/frontend'
# cache-dependency-path: 'src/lib/stream/webrtc/frontend'

- name: Install build dependencies - Install Yarn
run: npm install --global yarn
Expand All @@ -65,10 +64,10 @@ jobs:

- name: Check clippy
run: cargo clippy --all-features --locked

- name: Build
run: cargo build --verbose --locked

- name: Install runtime dependencies
uses: awalsh128/cache-apt-pkgs-action@v1
with:
Expand All @@ -78,6 +77,6 @@ jobs:
gstreamer1.0-nice \
gstreamer1.0-libav \
gstreamer1.0-plugins-ugly
- name: Run tests
run: cargo test --verbose --locked
11 changes: 2 additions & 9 deletions .github/workflows/test_webrtc_leak.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ jobs:
apt install -y --no-install-recommends \
libunwind-dev \
libclang-dev \
libssl-dev \
pkg-config \
build-essential \
curl \
Expand All @@ -43,11 +42,11 @@ jobs:
with:
node-version: '20'
# cache: 'yarn'
# cache-dependency-path: 'src/stream/webrtc/frontend'
# cache-dependency-path: 'src/lib/stream/webrtc/frontend'

- name: Install build dependencies - Install Yarn
run: npm install --global yarn

- name: Set directory to safe for git
# Note: Required by vergen (https://crates.io/crates/vergen)
run: git config --global --add safe.directory $GITHUB_WORKSPACE
Expand Down Expand Up @@ -76,12 +75,6 @@ jobs:
gstreamer1.0-libav \
gstreamer1.0-plugins-ugly
- name: Install runtime dependencies - libssl.so.1.1
# Note: if the link breaks, find it here: https://packages.ubuntu.com/focal/amd64/libssl1.1/download
run: |
wget http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.22_amd64.deb -O /tmp/openssl.deb
dpkg -i /tmp/openssl.deb
- name: Install runtime dependencies - Google Chrome and Chromedriver
# Get the json API from https://github.com/GoogleChromeLabs/chrome-for-testing?tab=readme-ov-file#json-api-endpoints
run: |
Expand Down
Loading

0 comments on commit 1c3367f

Please sign in to comment.