Support Ubuntu 24.04 (#55)

microsoft · Jul 21, 2024 · 7dbaba9 · 7dbaba9
1 parent fb54e77
commit 7dbaba9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/build-reuse-unix.yml b/.github/workflows/build-reuse-unix.yml
@@ -32,6 +32,7 @@ on:
         # options:
         #   - ubuntu-20.04
         #   - ubuntu-22.04
+        #   - ubuntu-24.04
         #   - macos-12
       arch:
         required: false
@@ -54,7 +55,7 @@ jobs:
     name: Build
     runs-on: ${{ inputs.os }}
     container:
-      image: ${{ inputs.plat == 'linux' && format('ghcr.io/microsoft/msquic/linux-build-xcomp:{0}', inputs.os) || '' }}
+      image: ${{ inputs.plat == 'linux' && format('ghcr.io/microsoft/msquic/linux-build-xcomp:{0}-cross', inputs.os) || '' }}
     steps:
     - name: Checkout repository
       uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -62,7 +62,7 @@ jobs:
       matrix:
         config: ['Debug', 'Release']
         plat: [linux]
-        os: ['ubuntu-20.04', 'ubuntu-22.04']
+        os: ['ubuntu-20.04', 'ubuntu-22.04', 'ubuntu-24.04']
         arch: [arm, arm64]
     uses: ./.github/workflows/build-reuse-unix.yml
     with:
@@ -79,7 +79,7 @@ jobs:
       matrix:
         config: ['Debug', 'Release']
         plat: [linux, android]
-        os: ['ubuntu-20.04', 'ubuntu-22.04']
+        os: ['ubuntu-20.04', 'ubuntu-22.04', 'ubuntu-24.04']
         arch: [x86, x64]
         clang: ['', '-Clang']
         exclude:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -61,7 +61,9 @@ jobs:
           { config: "Debug", plat: "linux", os: "ubuntu-20.04", arch: "x64" },
           { config: "Release", plat: "linux", os: "ubuntu-20.04", arch: "x64" },
           { config: "Debug", plat: "linux", os: "ubuntu-22.04", arch: "x64" },
-          { config: "Release", plat: "linux", os: "ubuntu-22.04", arch: "x64" }
+          { config: "Release", plat: "linux", os: "ubuntu-22.04", arch: "x64" },
+          { config: "Debug", plat: "linux", os: "ubuntu-24.04", arch: "x64" },
+          { config: "Release", plat: "linux", os: "ubuntu-24.04", arch: "x64" }
         ]
     uses: ./.github/workflows/build-reuse-unix.yml
     with:
@@ -97,6 +99,8 @@ jobs:
           { config: "Release", plat: "linux",   os: "ubuntu-20.04", arch: "x64" },
           { config: "Debug",   plat: "linux",   os: "ubuntu-22.04", arch: "x64" },
           { config: "Release", plat: "linux",   os: "ubuntu-22.04", arch: "x64" },
+          { config: "Debug",   plat: "linux",   os: "ubuntu-24.04", arch: "x64" },
+          { config: "Release", plat: "linux",   os: "ubuntu-24.04", arch: "x64" },
           { config: "Debug",   plat: "windows", os: "windows-2019", arch: "x64" },
           { config: "Release", plat: "windows", os: "windows-2019", arch: "x64" },
           { config: "Debug",   plat: "windows", os: "windows-2022", arch: "x64" },