Skip to content

Commit

Permalink
Merge branch 'main' into external-execution
Browse files Browse the repository at this point in the history
  • Loading branch information
nibanks committed Jan 4, 2025
2 parents dd7abe0 + 453fb17 commit be0855e
Show file tree
Hide file tree
Showing 34 changed files with 812 additions and 334 deletions.
5 changes: 3 additions & 2 deletions .CodeQL.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@
# https://eng.ms/docs/cloud-ai-platform/devdiv/one-engineering-system-1es/1es-docs/codeql/troubleshooting/bugs/generated-library-code
# (Access restricted to Microsoft employees only.)

# The following paths are explicitly classified which indicates they should no
# The following paths are explicitly classified which indicates they should not
# be analyzed by CodeQL and generate alerts.
path_classifiers:
docs:
- docs
generated:
- build
- src/cs
- src/generated
submodules:
- subodules
- submodules
1 change: 1 addition & 0 deletions .github/workflows/build-darwin-framework.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,4 @@ jobs:
uses: ./.github/workflows/build-reuse-darwin-framework.yml
with:
config: 'Release'
repo: ${{ github.repository }}
11 changes: 8 additions & 3 deletions .github/workflows/build-reuse-darwin-framework.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ on:
required: false
default: ''
type: string
repo:
required: false
default: microsoft/msquic
type: string
config:
required: false
default: 'Release'
Expand Down Expand Up @@ -46,6 +50,7 @@ jobs:
arch: ${{ matrix.arch }}
tls: ${{ inputs.tls }}
static: ${{ inputs.static }}
repo: ${{ inputs.repo }}

build-darwin-universal:
name: Build Universal Binaries
Expand All @@ -55,7 +60,7 @@ jobs:
- name: Checkout repository
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
with:
repository: microsoft/msquic
repository: ${{ inputs.repo}}
ref: ${{ inputs.ref }}
- name: Download Build Artifacts (x64)
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
Expand Down Expand Up @@ -92,7 +97,7 @@ jobs:
- name: Checkout repository
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
with:
repository: microsoft/msquic
repository: ${{ inputs.repo}}
ref: ${{ inputs.ref }}
- name: Download Build Artifacts (x64)
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
Expand All @@ -116,7 +121,7 @@ jobs:
- name: Checkout repository
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
with:
repository: microsoft/msquic
repository: ${{ inputs.repo}}
ref: ${{ inputs.ref }}
- name: Download Build Artifacts (iOS x64)
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/build-reuse-unix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ on:
required: false
default: ''
type: string
repo:
required: false
default: microsoft/msquic
type: string
config:
required: false
default: 'Release'
Expand Down Expand Up @@ -91,7 +95,7 @@ jobs:
- name: Checkout repository
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
with:
repository: microsoft/msquic
repository: ${{ inputs.repo}}
ref: ${{ inputs.ref }}
- name: Set ownership
if: inputs.plat == 'linux'
Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/build-reuse-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ on:
required: false
default: ''
type: string
repo:
required: false
default: microsoft/msquic
type: string
config:
required: false
default: 'Release'
Expand Down Expand Up @@ -71,7 +75,7 @@ jobs:
- name: Checkout repository
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
with:
repository: microsoft/msquic
repository: ${{ inputs.repo}}
ref: ${{ inputs.ref }}
- name: Install Perl
uses: shogo82148/actions-setup-perl@98dfedee230bcf1ee68d5b021931fc8d63f2016e
Expand All @@ -87,11 +91,11 @@ jobs:
shell: pwsh
run: scripts/build.ps1 -Config ${{ inputs.config }} -Platform ${{ inputs.plat }} -Arch ${{ inputs.arch }} -Tls ${{ inputs.tls }} -DisablePerf -DynamicCRT ${{ inputs.sanitize }}
- name: Build External Platform Test
if: inputs.build == '-Test' && inputs.sanitize != '-Sanitize'
if: inputs.build == '-Test'
shell: pwsh
run: |
cmake --install build\${{ inputs.plat }}\${{ inputs.arch }}_${{ inputs.tls }} --config ${{ inputs.config }}
cmake src/platform/unittest/external -G "Visual Studio 17 2022" -A ${{ inputs.arch }} -B build_external "-DCMAKE_INSTALL_PREFIX:PATH=C:/Program Files/msquic" -DQUIC_TLS=${{ inputs.tls }}
cmake src/platform/unittest/external -G "Visual Studio 17 2022" -A ${{ inputs.arch }} -B build_external "-DCMAKE_INSTALL_PREFIX:PATH=C:/Program Files/msquic"
cmake --build build_external --config ${{ inputs.config }}
- name: Build For Perf
if: inputs.build == '-Perf'
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/build-reuse-winkernel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ on:
required: false
default: ''
type: string
repo:
required: false
default: microsoft/msquic
type: string
config:
required: false
default: 'Release'
Expand Down Expand Up @@ -60,7 +64,7 @@ jobs:
- name: Checkout repository
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
with:
repository: microsoft/msquic
repository: ${{ inputs.repo}}
ref: ${{ inputs.ref }}
- name: Prepare Machine
shell: pwsh
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ jobs:
arch: ${{ matrix.arch }}
tls: ${{ matrix.tls }}
static: ${{ matrix.static }}
repo: ${{ github.repository }}

build-windows-kernel:
name: WinKernel
Expand All @@ -72,6 +73,7 @@ jobs:
os: ${{ matrix.os }}
arch: ${{ matrix.arch }}
tls: ${{ matrix.tls }}
repo: ${{ github.repository }}

build-ubuntu-cross-compile:
name: UbuntuArm
Expand All @@ -93,6 +95,7 @@ jobs:
arch: ${{ matrix.arch }}
tls: ${{ matrix.tls }}
static: ${{ matrix.static }}
repo: ${{ github.repository }}

build-ubuntu:
name: Ubuntu
Expand Down Expand Up @@ -177,6 +180,7 @@ jobs:
clang: ${{ matrix.clang }}
codecheck: ${{ matrix.codecheck }}
xdp: ${{ matrix.xdp }}
repo: ${{ github.repository }}

build-darwin:
name: MacOs
Expand All @@ -198,6 +202,7 @@ jobs:
arch: ${{ matrix.arch }}
tls: ${{ matrix.tls }}
static: ${{ matrix.static }}
repo: ${{ github.repository }}

build-nuget:
name: Build Nuget Package
Expand Down
11 changes: 8 additions & 3 deletions .github/workflows/cargo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,12 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest, macos-latest-xlarge]
features: ["", "--features static"]
runs-on: ${{ matrix.os }}
name: Cargo
steps:
- name: Harden Runner
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f
with:
egress-policy: audit
- name: Checkout repository
Expand All @@ -40,9 +41,13 @@ jobs:
- name: Install Cargo
if: runner.os == 'Linux'
run: curl https://sh.rustup.rs -sSf | sh -s -- -y
- name: Cargo fmt
run: cargo fmt --all -- --check
- name: Cargo clippy
run: cargo clippy --all-targets -- -D warnings
- name: Cargo build
run: cargo build --all
run: cargo build --all ${{ matrix.features }}
- name: Cargo test
run: cargo test --all
run: cargo test --all ${{ matrix.features }}
- name: Cargo Publish (dry run)
run: cargo publish --dry-run --allow-dirty
3 changes: 2 additions & 1 deletion .github/workflows/code-coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ jobs:
tls: ${{ matrix.vec.tls }}
sanitize: ${{ matrix.vec.sanitize }}
build: ${{ matrix.vec.build }}
repo: ${{ github.repository }}

bvt-winlatest:
name: BVT WinPrerelease
Expand Down Expand Up @@ -233,7 +234,7 @@ jobs:
with:
name: merged
- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@015f24e6818733317a2da2edd6290ab26238649a
uses: codecov/codecov-action@7f8b4b4bde536c465e797be725718b88c5d95e0e
with:
fail_ci_if_error: true
files: msquiccoverage.xml
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:

steps:
- name: Harden Runner
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f
with:
egress-policy: audit
- name: Checkout repository
Expand All @@ -51,7 +51,7 @@ jobs:
cmake --build . --target OpenSSL_Target
- name: Initialize CodeQL
uses: github/codeql-action/init@f09c1c0a94de965c15400f5634aa42fac8fb8f88
uses: github/codeql-action/init@df409f7d9260372bd5f19e5b04e83cb3c43714ae
with:
languages: cpp
config-file: ./.github/codeql/codeql-config.yml
Expand All @@ -62,4 +62,4 @@ jobs:
cmake --build .
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@f09c1c0a94de965c15400f5634aa42fac8fb8f88
uses: github/codeql-action/analyze@df409f7d9260372bd5f19e5b04e83cb3c43714ae
2 changes: 1 addition & 1 deletion .github/workflows/docker-publish-xcomp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:

steps:
- name: Harden Runner
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f
with:
egress-policy: audit

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:

steps:
- name: Harden Runner
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f
with:
egress-policy: audit
- name: Checkout repository
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/dotnet-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ jobs:
uses: ./.github/workflows/build-reuse-darwin-framework.yml
with:
config: 'Debug'
repo: ${{ github.repository }}

build-linux:
name: Ubuntu
Expand All @@ -45,6 +46,7 @@ jobs:
arch: ${{ matrix.vec.arch }}
tls: ${{ matrix.vec.tls }}
xdp: ${{ matrix.vec.xdp }}
repo: ${{ github.repository }}

build-windows:
name: Windows
Expand All @@ -63,6 +65,7 @@ jobs:
os: ${{ matrix.vec.os }}
arch: ${{ matrix.vec.arch }}
tls: ${{ matrix.vec.tls }}
repo: ${{ github.repository }}

dotnet-test:
name: DotNet Test
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/package-reuse-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ jobs:
clang: ${{ inputs.clang }}
build: ${{ inputs.build }}
xdp: ${{ inputs.xdp }}
repo: ${{ github.repository }}

package:
name: Package
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scorecards-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,6 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@f09c1c0a94de965c15400f5634aa42fac8fb8f88
uses: github/codeql-action/upload-sarif@df409f7d9260372bd5f19e5b04e83cb3c43714ae
with:
sarif_file: results.sarif
2 changes: 2 additions & 0 deletions .github/workflows/stress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ jobs:
tls: ${{ matrix.vec.tls }}
sanitize: ${{ matrix.vec.sanitize }}
build: ${{ matrix.vec.build }}
repo: ${{ github.repository }}

build-unix:
name: Build Unix
Expand All @@ -66,6 +67,7 @@ jobs:
sanitize: ${{ matrix.vec.sanitize }}
build: ${{ matrix.vec.build }}
xdp: ${{ matrix.vec.xdp }}
repo: ${{ github.repository }}

stress:
name: Stress
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/test-down-level.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,17 @@ jobs:
{ release: "2.2.6", os: "windows-2022", arch: "x64", tls: "openssl" },
{ release: "2.2.6", os: "windows-2022", arch: "x64", tls: "openssl3" },
# v2.3
{ release: "2.3.6", os: "ubuntu-20.04", arch: "x64", tls: "openssl" },
{ release: "2.3.6", os: "ubuntu-22.04", arch: "x64", tls: "openssl3" },
{ release: "2.3.6", os: "windows-2022", arch: "x64", tls: "schannel" },
{ release: "2.3.6", os: "windows-2022", arch: "x64", tls: "openssl" },
{ release: "2.3.6", os: "windows-2022", arch: "x64", tls: "openssl3" },
{ release: "2.3.8", os: "ubuntu-20.04", arch: "x64", tls: "openssl" },
{ release: "2.3.8", os: "ubuntu-22.04", arch: "x64", tls: "openssl3" },
{ release: "2.3.8", os: "windows-2022", arch: "x64", tls: "schannel" },
{ release: "2.3.8", os: "windows-2022", arch: "x64", tls: "openssl" },
{ release: "2.3.8", os: "windows-2022", arch: "x64", tls: "openssl3" },
# v2.4
{ release: "2.4.5", os: "ubuntu-20.04", arch: "x64", tls: "openssl" },
{ release: "2.4.5", os: "ubuntu-22.04", arch: "x64", tls: "openssl3" },
{ release: "2.4.5", os: "windows-2022", arch: "x64", tls: "schannel" },
{ release: "2.4.5", os: "windows-2022", arch: "x64", tls: "openssl" },
{ release: "2.4.5", os: "windows-2022", arch: "x64", tls: "openssl3" },
{ release: "2.4.7", os: "ubuntu-20.04", arch: "x64", tls: "openssl" },
{ release: "2.4.7", os: "ubuntu-22.04", arch: "x64", tls: "openssl3" },
{ release: "2.4.7", os: "windows-2022", arch: "x64", tls: "schannel" },
{ release: "2.4.7", os: "windows-2022", arch: "x64", tls: "openssl" },
{ release: "2.4.7", os: "windows-2022", arch: "x64", tls: "openssl3" },
]
runs-on: ${{ matrix.vec.os }}
name: Test
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ jobs:
tls: ${{ matrix.vec.tls }}
build: ${{ matrix.vec.build }}
ref: ${{ inputs.ref || '' }}
repo: ${{ github.repository }}

build-windows:
name: Build WinUser
Expand All @@ -66,6 +67,7 @@ jobs:
sanitize: ${{ matrix.vec.sanitize }}
build: ${{ matrix.vec.build }}
ref: ${{ inputs.ref || '' }}
repo: ${{ github.repository }}

build-unix:
name: Build Unix
Expand Down Expand Up @@ -94,6 +96,7 @@ jobs:
build: ${{ matrix.vec.build }}
xdp: ${{ matrix.vec.xdp }}
ref: ${{ inputs.ref || '' }}
repo: ${{ github.repository }}

bvt:
name: BVT
Expand Down
Loading

0 comments on commit be0855e

Please sign in to comment.