Skip to content

Commit

Permalink
Merge branch 'nibanks/kernel-platform-worker' into dev/daiki/winkerne…
Browse files Browse the repository at this point in the history
…l_merging_exp
  • Loading branch information
nibanks committed Feb 13, 2025
2 parents 6cd0fee + b77cb3f commit 565f872
Show file tree
Hide file tree
Showing 130 changed files with 15,476 additions and 2,358 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
8 changes: 4 additions & 4 deletions .azure/OneBranch.Tests.Official.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ stages:
- template: ./obtemplates/run-bvt.yml
parameters:
pool: 1es-msquic-pool-internal
image: WinServerPrerelease
image: WinServerPrerelease-LatestPwsh
platform: windows
tls: schannel
logProfile: Full.Light
Expand All @@ -45,7 +45,7 @@ stages:
- template: ./obtemplates/run-bvt.yml
parameters:
pool: 1es-msquic-pool-internal
image: WinServerPrerelease
image: WinServerPrerelease-LatestPwsh
platform: windows
tls: schannel
logProfile: Full.Light
Expand All @@ -63,7 +63,7 @@ stages:
- template: ./obtemplates/run-bvt.yml
parameters:
pool: 1es-msquic-pool-internal
image: WinServerPrerelease
image: WinServerPrerelease-LatestPwsh
platform: windows
tls: schannel
logProfile: Full.Light
Expand All @@ -81,7 +81,7 @@ stages:
- template: ./obtemplates/run-bvt.yml
parameters:
pool: 1es-msquic-pool-internal
image: WinServerPrerelease
image: WinServerPrerelease-LatestPwsh
platform: windows
tls: schannel
logProfile: Full.Light
Expand Down
8 changes: 4 additions & 4 deletions .azure/OneBranch.Tests.PullRequest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ stages:
- template: ./obtemplates/run-bvt.yml
parameters:
pool: 1es-msquic-pool-internal
image: WinServerPrerelease
image: WinServerPrerelease-LatestPwsh
platform: windows
tls: schannel
logProfile: Full.Light
Expand All @@ -45,7 +45,7 @@ stages:
- template: ./obtemplates/run-bvt.yml
parameters:
pool: 1es-msquic-pool-internal
image: WinServerPrerelease
image: WinServerPrerelease-LatestPwsh
platform: windows
tls: schannel
logProfile: Full.Light
Expand All @@ -63,7 +63,7 @@ stages:
- template: ./obtemplates/run-bvt.yml
parameters:
pool: 1es-msquic-pool-internal
image: WinServerPrerelease
image: WinServerPrerelease-LatestPwsh
platform: windows
tls: schannel
logProfile: Full.Light
Expand All @@ -81,7 +81,7 @@ stages:
- template: ./obtemplates/run-bvt.yml
parameters:
pool: 1es-msquic-pool-internal
image: WinServerPrerelease
image: WinServerPrerelease-LatestPwsh
platform: windows
tls: schannel
logProfile: Full.Light
Expand Down
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 }}
17 changes: 11 additions & 6 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 All @@ -71,7 +76,7 @@ jobs:
shell: pwsh
run: scripts/merge-darwin.ps1 -DeleteSource -Config ${{ inputs.config }}
- name: Upload build artifacts
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08
with:
name: ${{ inputs.config }}-macos-macos-13-universal-${{ inputs.tls }}${{ inputs.static }}
path: artifacts
Expand All @@ -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 @@ -103,7 +108,7 @@ jobs:
shell: pwsh
run: scripts/package-darwin-framework.ps1 -Config ${{ inputs.config }} -Platform ${{ matrix.vec.plat }} -Arch ${{ matrix.vec.arch }}
- name: Upload build artifacts
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08
with:
name: Framework-${{ inputs.config }}-${{ matrix.vec.plat }}-macos-13-${{ matrix.vec.arch }}-${{ inputs.tls }}${{ inputs.static }}
path: artifacts
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 All @@ -137,7 +142,7 @@ jobs:
shell: pwsh
run: scripts/package-darwin-xcframework.ps1 -Config ${{ inputs.config }}
- name: Upload build artifacts
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08
with:
name: XCFramework-${{ inputs.config }}
path: artifacts/frameworks
11 changes: 7 additions & 4 deletions .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 All @@ -28,9 +32,8 @@ on:
os:
required: false
type: string
default: 'ubuntu-20.04'
default: 'ubuntu-22.04'
# options:
# - ubuntu-20.04
# - ubuntu-22.04
# - ubuntu-24.04
# - macos-13
Expand Down Expand Up @@ -91,7 +94,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 All @@ -114,7 +117,7 @@ jobs:
shell: pwsh
run: scripts/build.ps1 -Config ${{ inputs.config }} -Platform ${{ inputs.plat }} -Arch ${{ inputs.arch }} -Tls ${{ inputs.tls }} ${{ inputs.static }} ${{ inputs.clang }} ${{ inputs.systemcrypto }} ${{ inputs.codecheck }} ${{ inputs.sanitize }} ${{ inputs.xdp }} -OneBranch
- name: Upload build artifacts
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08
with:
name: ${{ inputs.config }}-${{ inputs.plat }}-${{ inputs.os }}-${{ inputs.arch }}-${{ inputs.tls }}${{ inputs.static }}${{ inputs.clang }}${{ inputs.systemcrypto }}${{ inputs.codecheck }}${{ inputs.sanitize }}${{ inputs.xdp }}${{ inputs.build }}
path: artifacts
8 changes: 6 additions & 2 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 Down Expand Up @@ -108,7 +112,7 @@ jobs:
Remove-Item artifacts/corenet-ci-main -Recurse -Force -ErrorAction Ignore
Remove-Item artifacts/xdp -Recurse -Force -ErrorAction Ignore
- name: Upload build artifacts
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08
with:
name: ${{ inputs.config }}-${{ inputs.plat }}-${{ inputs.os }}-${{ inputs.arch }}-${{ inputs.tls }}${{ inputs.sanitize }}${{ inputs.static }}${{ inputs.build }}
path: artifacts
8 changes: 6 additions & 2 deletions .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 Expand Up @@ -88,7 +92,7 @@ jobs:
Remove-Item artifacts/corenet-ci-main -Recurse -Force -ErrorAction Ignore
Remove-Item artifacts/xdp -Recurse -Force -ErrorAction Ignore
- name: Upload build artifacts
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08
with:
name: ${{ inputs.config }}-${{ inputs.plat }}-${{ inputs.os }}-${{ inputs.arch }}-${{ inputs.tls }}${{ inputs.build }}
path: artifacts
17 changes: 8 additions & 9 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 @@ -81,7 +83,7 @@ jobs:
matrix:
config: ['Debug', 'Release']
plat: [linux]
os: ['ubuntu-20.04', 'ubuntu-22.04', 'ubuntu-24.04']
os: ['ubuntu-22.04', 'ubuntu-24.04']
arch: [arm, arm64]
tls: [openssl, openssl3]
static: ['', '-Static']
Expand All @@ -93,6 +95,7 @@ jobs:
arch: ${{ matrix.arch }}
tls: ${{ matrix.tls }}
static: ${{ matrix.static }}
repo: ${{ github.repository }}

build-ubuntu:
name: Ubuntu
Expand All @@ -102,7 +105,7 @@ jobs:
matrix:
config: ['Debug', 'Release']
plat: [linux, android]
os: ['ubuntu-20.04', 'ubuntu-22.04', 'ubuntu-24.04']
os: ['ubuntu-22.04', 'ubuntu-24.04']
arch: [x86, x64]
tls: [openssl, openssl3]
systemcrypto: ['', '-UseSystemOpenSSLCrypto']
Expand All @@ -120,10 +123,6 @@ jobs:
# TODO: android to support ubuntu-24.04
- plat: android
os: 'ubuntu-24.04'
# No openssl3 system crypto on ubuntu-20.04
- plat: linux
os: 'ubuntu-20.04'
tls: 'openssl3'
systemcrypto: '-UseSystemOpenSSLCrypto'
# No openssl system crypto on ubuntu-22.04
- plat: linux
Expand All @@ -138,8 +137,6 @@ jobs:
# linux xdp is for ubuntu24.04 only for now
- plat: android
xdp: "-UseXdp"
- os: 'ubuntu-20.04'
xdp: "-UseXdp"
- os: 'ubuntu-22.04'
xdp: "-UseXdp"
- arch: x86
Expand Down Expand Up @@ -177,6 +174,7 @@ jobs:
clang: ${{ matrix.clang }}
codecheck: ${{ matrix.codecheck }}
xdp: ${{ matrix.xdp }}
repo: ${{ github.repository }}

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

build-nuget:
name: Build Nuget Package
Expand Down Expand Up @@ -236,7 +235,7 @@ jobs:
shell: pwsh
run: scripts/package-nuget.ps1 -Tls ${{ matrix.vec.tls }} ${{ matrix.vec.arg }} -GHA
- name: Upload build artifacts
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08
with:
name: Nuget-Release-${{ matrix.vec.plat }}-windows-2022-arm64-${{ matrix.vec.tls }}
path: artifacts/dist/*.nupkg
Expand Down
25 changes: 23 additions & 2 deletions .github/workflows/cargo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,23 @@ permissions: read-all
jobs:
cargo:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest, macos-latest-xlarge]
features: ["", "--features static", "--features schannel", "--features schannel,static", "--features overwrite"]
exclude:
- os: ubuntu-latest
features: "--features schannel"
- os: ubuntu-latest
features: "--features schannel,static"
- os: macos-latest
features: "--features schannel"
- os: macos-latest
features: "--features schannel,static"
- os: macos-latest-xlarge
features: "--features schannel"
- os: macos-latest-xlarge
features: "--features schannel,static"
runs-on: ${{ matrix.os }}
name: Cargo
steps:
Expand All @@ -40,9 +55,15 @@ 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: Check all generated files with git
run: git diff --exit-code
- 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
Loading

0 comments on commit 565f872

Please sign in to comment.