Skip to content

Commit

Permalink
Merge branch 'v3' into add-sr-trace
Browse files Browse the repository at this point in the history
  • Loading branch information
ibc authored Jan 2, 2024
2 parents 5d402d4 + a36f2c2 commit 6743c76
Show file tree
Hide file tree
Showing 139 changed files with 1,592 additions and 23,862 deletions.
36 changes: 19 additions & 17 deletions .github/workflows/codeql.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL"
name: CodeQL

on:
push:
branches: [ "v3" ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ "v3" ]
schedule:
- cron: '37 9 * * 5'
on: [pull_request, workflow_dispatch]

concurrency:
# Cancel a currently running workflow from the same PR, branch or tag when a
# new workflow is triggered.
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
timeout-minutes: 360
permissions:
actions: read
contents: read
Expand All @@ -32,20 +32,22 @@ jobs:
strategy:
fail-fast: false
matrix:
language: [ 'cpp', 'javascript', 'python' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
language: [ 'c-cpp', 'javascript-typescript', 'python' ]
# CodeQL supports [ 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' ]
# Use only 'java-kotlin' to analyze code written in Java, Kotlin or both
# Use only 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support

env:
MEDIASOUP_SKIP_WORKER_PREBUILT_DOWNLOAD: "true"
MEDIASOUP_SKIP_WORKER_PREBUILT_DOWNLOAD: 'true'

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -62,7 +64,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
Expand All @@ -75,6 +77,6 @@ jobs:
# ./location_of_script_within_repo/buildscript.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
with:
category: "/language:${{matrix.language}}"
category: '/language:${{matrix.language}}'
6 changes: 3 additions & 3 deletions .github/workflows/mediasoup-node.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: mediasoup-node

on: [push, pull_request]
on: [pull_request, workflow_dispatch]

concurrency:
# Cancel a currently running workflow from the same PR, branch or tag when a
Expand Down Expand Up @@ -31,10 +31,10 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.ci.node }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/mediasoup-rust.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: mediasoup-rust

on: [push, pull_request]
on: [pull_request, workflow_dispatch]

concurrency:
# Cancel a currently running workflow from the same PR, branch or tag when a
Expand Down Expand Up @@ -28,7 +28,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Configure cache
uses: actions/cache@v3
Expand Down
20 changes: 6 additions & 14 deletions .github/workflows/mediasoup-worker-prebuild.yaml
Original file line number Diff line number Diff line change
@@ -1,21 +1,13 @@
name: mediasoup-worker-prebuild

# Only trigger on GitHub releases.
on:
push:
# Only trigger for production releases.
tags:
- "*.*.*"

# Only trigger when other workflows succeeded.
workflow_run:
workflows: [mediasoup-worker, mediasoup-node, mediasoup-rust]
types:
- completed
release:
types: [published]

jobs:
ci:
strategy:
fail-fast: false
matrix:
build:
# For Linux let's use an old version of Ubuntu (20.04) that builds the
Expand All @@ -39,14 +31,14 @@ jobs:
env:
CC: ${{ matrix.build.cc }}
CXX: ${{ matrix.build.cxx }}
MEDIASOUP_SKIP_WORKER_PREBUILT_DOWNLOAD: "true"
MEDIASOUP_SKIP_WORKER_PREBUILT_DOWNLOAD: 'true'

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}

Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/mediasoup-worker.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: mediasoup-worker

on: [push, pull_request]
on: [pull_request, workflow_dispatch]

concurrency:
# Cancel a currently running workflow from the same PR, branch or tag when a
Expand All @@ -11,7 +11,6 @@ concurrency:
jobs:
ci:
strategy:
fail-fast: false
matrix:
build:
- os: ubuntu-20.04
Expand Down Expand Up @@ -48,10 +47,10 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}

Expand Down
18 changes: 0 additions & 18 deletions .github/workflows/pull-request-stats.yml

This file was deleted.

2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
# Ignore all fuzzer generated test inputs.
/worker/fuzzer/new-corpus/*
!/worker/fuzzer/new-corpus/.placeholder
# lcov is just for local usage.
/worker/lcov

## Others.
/coverage
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,14 @@

### NEXT

* Avoid modification of user input data ([PR #1285](https://github.com/versatica/mediasoup/pull/1285)).


### 3.13.13

* worker: Do not use references for async callbacks ([PR #1274](https://github.com/versatica/mediasoup/pull/1274)).
* liburing: Enable zero copy ([PR #1273](https://github.com/versatica/mediasoup/pull/1273)).
* Fix build on musl based systems (such as Alpine Linux) ([PR #1279](https://github.com/versatica/mediasoup/pull/1279)).


### 3.13.12
Expand Down
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 6743c76

Please sign in to comment.