Merge branch 'microsoft:main' into main

microsoft · Sep 17, 2024 · 62458da · 62458da
2 parents 4afc187 + 9c4dceb
commit 62458da
Show file tree

Hide file tree

Showing 109 changed files with 2,508 additions and 1,070 deletions.
diff --git a/.azure/OneBranch.Official.yml b/.azure/OneBranch.Official.yml
@@ -78,10 +78,10 @@ extends:
       - container: linux_build_container # Default container
         image: 'ghcr.io/microsoft/msquic/linux-build-xcomp:ubuntu-20.04-cross'
         type: Linux
-      - container: ubuntu_2204_cross
+      - container: kernel5_15_cross
         image: 'ghcr.io/microsoft/msquic/linux-build-xcomp:ubuntu-22.04-cross'
         type: Linux
-      - container: ubuntu_2404_cross
+      - container: kernel6_8_cross
         image: 'ghcr.io/microsoft/msquic/linux-build-xcomp:ubuntu-24.04-cross'
         type: Linux
 
@@ -179,23 +179,23 @@ extends:
       - template: .azure/obtemplates/build-linux.yml@self
         parameters:
           config: Release
-          os: ubuntu_2204
+          kernel: "kernel5_15"
           tls: openssl3
       - template: .azure/obtemplates/build-linux.yml@self
         parameters:
           config: Debug
-          os: ubuntu_2204
+          kernel: "kernel5_15"
           tls: openssl3
       - template: .azure/obtemplates/build-linux.yml@self
         parameters:
           config: Release
-          os: ubuntu_2404
+          kernel: "kernel6_8"
           tls: openssl3
           xdp: "-UseXdp"
       - template: .azure/obtemplates/build-linux.yml@self
         parameters:
           config: Debug
-          os: ubuntu_2404
+          kernel: "kernel6_8"
           tls: openssl3
           xdp: "-UseXdp"
 
@@ -207,6 +207,15 @@ extends:
       - template: .azure/obtemplates/build-linux-packages.yml@self
         parameters:
           sign: true
+          kernel: "kernel5_4"
+      - template: .azure/obtemplates/build-linux-packages.yml@self
+        parameters:
+          sign: true
+          kernel: "kernel5_15"
+      - template: .azure/obtemplates/build-linux-packages.yml@self
+        parameters:
+          sign: true
+          kernel: "kernel6_8"
 
     - stage: package_windows
       displayName: Package Windows