Build with Ubuntu 22.04

Author: lilleyse

.github/actions/action.yml

@@ -1,5 +1,5 @@
-name: "AlmaLinux 8 Build"
-description: "Build Cesium for Omniverse in Docker container running a AlmaLinux 8 image"
+name: "Ubuntu 22 Build"
+description: "Build Cesium for Omniverse in Docker container running an Ubuntu 22 image"
 inputs:
   build-type:
     description: "Release or debug build"

.github/workflows/main.yml

@@ -43,13 +43,13 @@ jobs:
               coverage: "false",
             }
           - {
-              name: "AlmaLinux 8 - GCC",
+              name: "Ubuntu 22 - GCC",
               artifact: "linux-gcc.tar.xz",
               os: ubuntu-24.04,
               cc: "gcc-13",
               cxx: "g++-13",
               build-type: "Release",
-              build-code: "AlmaLinux8",
+              build-code: "Ubuntu22",
               cache-type: "Linux",
               generator: "Unix Makefiles",
               coverage: "false",
@@ -88,7 +88,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ${{ env.CONAN_USER_HOME }}/.conan
-          key: conan-${{ matrix.config.name }}-${{ hashFiles('cmake/AddConanDependencies.cmake') }}-v4
+          key: conan-${{ matrix.config.name }}-${{ hashFiles('cmake/AddConanDependencies.cmake') }}-v5
 
       # Tell ezvcpkg to look for or create its build folder (.ezvcpkg) in the repository's root directory
       # This is partly done to make the directory easily accessible to Docker builds
@@ -110,33 +110,33 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ${{ env.EZVCPKG_BASEDIR }}
-          key: vcpkg-${{ matrix.config.name }}-${{ hashFiles('vcpkg/ports/**/*', 'vcpkg/triplets/**/*') }}-${{ hashFiles('extern/cesium-native/CMakeLists.txt', 'CMakeLists.txt') }}
+          key: vcpkg-${{ matrix.config.name }}-${{ hashFiles('vcpkg/ports/**/*', 'vcpkg/triplets/**/*') }}-${{ hashFiles('extern/cesium-native/CMakeLists.txt', 'CMakeLists.txt') }}-v1
 
       - name: Packman Check cache
         id: packman-cache
         uses: actions/cache@v3
         with:
           path: ${{ env.PM_PACKAGES_ROOT }}
-          key: packman-${{ matrix.config.cache-type }}-${{ hashFiles('extern/nvidia/deps/kit-sdk.packman.xml', 'extern/nvidia/deps/target-deps.packman.xml') }}
+          key: packman-${{ matrix.config.cache-type }}-${{ hashFiles('extern/nvidia/deps/kit-sdk.packman.xml', 'extern/nvidia/deps/target-deps.packman.xml') }}-v1
 
-      - name: AlmaLinux Build with Docker
+      - name: Ubuntu 22 Build with Docker
         uses: ./.github/actions
-        if: matrix.config.name == 'AlmaLinux 8 - GCC'
+        if: matrix.config.name == 'Ubuntu 22 - GCC'
         with:
           build-type: ${{ matrix.config.build-type }}
 
       # Change the ownership from root to user for all files created by Docker in
       # the Conan build directory so that the files can be cached without permission
       # denied errors
-      - name: AlmaLinux Change Conan, vcpkg, and Packman directory permissions
-        if: matrix.config.name == 'AlmaLinux 8 - GCC'
+      - name: Ubuntu 22 Change Conan, vcpkg, and Packman directory permissions
+        if: matrix.config.name == 'Ubuntu 22 - GCC'
         run: |
           sudo chown -R $USER:$USER $CONAN_USER_HOME/.conan
           sudo chown -R $USER:$USER $PM_PACKAGES_ROOT
           sudo chown -R $USER:$USER $EZVCPKG_BASEDIR
 
       - name: Install Linux dependencies
-        if: ${{ runner.os == 'Linux' && matrix.config.name != 'AlmaLinux 8 - GCC' }}
+        if: ${{ runner.os == 'Linux' && matrix.config.name != 'Ubuntu 22 - GCC' }}
         run: |
           sudo apt update
           sudo apt install -y doxygen clang-tidy-15 clang-format-15 gcovr
@@ -161,7 +161,7 @@ jobs:
       # Note: CMAKE_BUILD_TYPE is only used by Linux. It is ignored for Windows.
       # Note: CMAKE_CONFIGURATION_TYPES is used by Windows to generate a single configuration for Release since we don't need Debug, RelWithDebugInfo, and MinSizeRel on CI. It is ignored for Linux.
       - name: Configure
-        if: matrix.config.name != 'AlmaLinux 8 - GCC'
+        if: matrix.config.name != 'Ubuntu 22 - GCC'
         run: cmake -B build -D Python3_EXECUTABLE=python3 -D CESIUM_OMNI_ENABLE_TESTS=OFF -D CESIUM_OMNI_ENABLE_COVERAGE=${{ matrix.config.coverage}} -D CMAKE_C_COMPILER=${{ matrix.config.cc }} -D CMAKE_CXX_COMPILER=${{ matrix.config.cxx }} -D CMAKE_BUILD_TYPE=${{ matrix.config.build-type }} -D CMAKE_CONFIGURATION_TYPES=${{ matrix.config.build-type }} -G "${{ matrix.config.generator }}"
 
       # Change the ownership from root to user for all files in the Conan cache so
@@ -176,19 +176,19 @@ jobs:
           $Acl.SetAccessRule($Ar)
 
       - name: Check C/C++ Formatting
-        if: matrix.config.name != 'AlmaLinux 8 - GCC'
+        if: matrix.config.name != 'Ubuntu 22 - GCC'
         run: cmake --build build --target clang-format-check-all --config ${{ matrix.config.build-type }}
 
       - name: Check Python Formatting
-        if: matrix.config.name != 'AlmaLinux 8 - GCC'
+        if: matrix.config.name != 'Ubuntu 22 - GCC'
         run: black --check --diff .
 
       - name: Check Python Linting
-        if: matrix.config.name != 'AlmaLinux 8 - GCC'
+        if: matrix.config.name != 'Ubuntu 22 - GCC'
         run: flake8
 
       - name: Build
-        if: matrix.config.name != 'AlmaLinux 8 - GCC'
+        if: matrix.config.name != 'Ubuntu 22 - GCC'
         run: cmake --build build --config ${{ matrix.config.build-type }} --parallel ${{ steps.cpu-cores.outputs.count }}
 
       - name: Coverage
@@ -197,19 +197,19 @@ jobs:
 
       - name: Documentation
         # Currently disabled for Windows because `choco install doxygen.install` is flaky
-        if: ${{ matrix.config.name != 'AlmaLinux 8 - GCC' && runner.os != 'Windows' }}
+        if: ${{ matrix.config.name != 'Ubuntu 22 - GCC' && runner.os != 'Windows' }}
         run: cmake --build build --target generate-documentation --config ${{ matrix.config.build-type }}
 
       - name: Install (Default/Kit)
-        if: matrix.config.name != 'AlmaLinux 8 - GCC'
+        if: matrix.config.name != 'Ubuntu 22 - GCC'
         run: cmake --install build --config ${{ matrix.config.build-type }}
 
       - name: Install (Library)
-        if: matrix.config.name != 'AlmaLinux 8 - GCC'
+        if: matrix.config.name != 'Ubuntu 22 - GCC'
         run: cmake --install build --config ${{ matrix.config.build-type }} --prefix install-library --component library
 
       - name: Package
-        if: matrix.config.name != 'AlmaLinux 8 - GCC'
+        if: matrix.config.name != 'Ubuntu 22 - GCC'
         run: cmake --build build --target package --config ${{ matrix.config.build-type }}
 
       - name: Capture Git info (not Windows)
@@ -241,6 +241,6 @@ jobs:
           aws-region: us-east-1
 
       - name: Upload to S3
-        if: ${{ matrix.config.name == 'AlmaLinux 8 - GCC' || runner.os == 'Windows' }}
+        if: ${{ matrix.config.name == 'Ubuntu 22 - GCC' || runner.os == 'Windows' }}
         run: |
           aws s3 cp build/${{ env.zip_name }} s3://cesium-builds/cesium-omniverse/${{ env.branch }}/${{ env.us_date }}/${{ env.sha_short }}/${{ matrix.config.build-code }}/

docker/CI.Dockerfile

@@ -1,4 +1,4 @@
-FROM cesiumgs/omniverse-almalinux8-build:2024-10-01
+FROM cesiumgs/omniverse-ubuntu22-build:2026-03-03
 
 WORKDIR /var/app
 

docker/Ubuntu22.Dockerfile

@@ -0,0 +1,48 @@
+# This is used to generate the image with dependencies that CI.Dockerfile relies on.
+# For instructions for deploying this, check docs/release-guide/push-docker-image.md.
+FROM ubuntu:22.04
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+# Update system
+RUN apt-get update && \
+    apt-get upgrade -y
+
+# Core build dependencies
+RUN apt-get install -y \
+    git \
+    git-lfs \
+    wget \
+    build-essential \
+    make \
+    doxygen \
+    curl \
+    libcurl4-openssl-dev \
+    zlib1g-dev \
+    libssl-dev \
+    libbz2-dev \
+    libffi-dev \
+    libsqlite3-dev \
+    liblzma-dev \
+    zip \
+    unzip \
+    perl \
+    pkg-config \
+    python3 \
+    python3-pip \
+    cmake
+
+# Allow mounted repos owned by host user
+RUN git config --global --add safe.directory /var/app
+
+# Initialize git-lfs
+RUN git lfs install
+
+# Python packages
+RUN pip3 install --no-cache-dir \
+    conan==1.63.0 \
+    gcovr
+
+WORKDIR /var/app
+
+ENTRYPOINT ["/bin/bash", "--login"]

docs/developer-setup/README.md

@@ -247,14 +247,14 @@ Install [Docker Engine CE For Ubuntu](https://docs.docker.com/engine/install/ubu
 Enter the container:
 
 ```sh
-docker build --tag cesiumgs/cesium-omniverse:almalinux8 -f docker/AlmaLinux8.Dockerfile .
-docker run --rm --interactive --tty --volume $PWD:/var/app cesiumgs/cesium-omniverse:almalinux8
+docker build --tag cesiumgs/cesium-omniverse:ubuntu22 -f docker/Ubuntu22.Dockerfile .
+docker run --rm --interactive --tty --volume $PWD:/var/app cesiumgs/cesium-omniverse:ubuntu22
 ```
 
 Once inside the container, build like usual. Note that linters are turned off. It won't affect the build, it just means there won't be code formatting or linting. It will build fine with GCC.
 
 ```sh
-cmake -B build -D CESIUM_OMNI_ENABLE_LINTERS=OFF
+cmake -B build -D CESIUM_OMNI_ENABLE_LINTERS=OFF -D VCPKG_TRIPLET=x64-linux
 cmake --build build
 ```
 
@@ -460,14 +460,17 @@ cmake --build build --target clang-tidy
 
 ### Build Linux Package (Local)
 
-Linux packages are built in the AlmaLinux 8 Docker container. A Red Hat Enterprise Linux 8 compatible OS is the [minimum OS required by Omniverse](https://docs.omniverse.nvidia.com/app_view/common/technical-requirements.html#suggested-minimums-by-product) and uses glibc 2.18 which is compatible with nearly all modern Linux distributions.
+Linux packages are built in the Ubuntu 22 Docker container. Ubuntu 22 uses glibc 2.35 which is the minimum requirement fpr Kit 107.3 and above.
 
-It's recommended to build AlmaLinux 8 packages in a separate clone of cesium-omniverse since the Docker container will overwrite files in the `extern/nvidia/_build` and `exts` folders.
+https://docs.omniverse.nvidia.com/kit/docs/kit-manual/107.0.3/guide/migration.html
+
+
+It's recommended to build Ubuntu 22 packages in a separate clone of cesium-omniverse since the Docker container will overwrite files in the `extern/nvidia/_build` and `exts` folders.
 
 Run the following shell script from the root cesium-omniverse directory:
 
 ```sh
-./scripts/build_package_almalinux8.sh
+./scripts/build_package_ubuntu22.sh
 ```
 
 The resulting `.zip` file will be written to the `build-package` directory (e.g. `CesiumGS-cesium-omniverse-linux-x86_64-v0.0.0.zip`)

docs/onboarding/README.md

@@ -20,7 +20,7 @@ There is also a similar [C++ extension template](https://github.com/NVIDIA-Omniv
 Some self-explanatory directories have been ommitted.
 
 - `apps` - Tools that use the extensions, such as the performance testing app, but are not themselves extensions
-- `docker` - Docker configuration for AlmaLinux 8 CI builds
+- `docker` - Docker configuration for Ubuntu 22 CI builds
 - `exts` - This is where extension code is kept. The file structure follows the pattern:
     ```
     exts

docs/release-guide/README.md

@@ -4,7 +4,7 @@ This is the process we follow when releasing a new version of Cesium for Omniver
 
 1. [Release a new version of Cesium for Omniverse Samples](#releasing-a-new-version-of-cesium-for-omniverse-samples).
 2. Make sure the latest commit in `main` is passing CI.
-3. Download the latest build from S3. In the AWS management console (InternalServices AWS account), go to the bucket [`cesium-builds/cesium-omniverse/main`](https://s3.console.aws.amazon.com/s3/buckets/cesium-builds?region=us-east-1&prefix=cesium-omniverse/main/&showversions=false), find the appropriate date and commit hash to download the AlmaLinux and Windows zip files (e.g. `CesiumGS-cesium-omniverse-linux-x86_64-xxxxxxx.zip` and `CesiumGS-cesium-omniverse-windows-x86_64-xxxxxxx.zip`)
+3. Download the latest build from S3. In the AWS management console (InternalServices AWS account), go to the bucket [`cesium-builds/cesium-omniverse/main`](https://s3.console.aws.amazon.com/s3/buckets/cesium-builds?region=us-east-1&prefix=cesium-omniverse/main/&showversions=false), find the appropriate date and commit hash to download the Ubuntu 22 and Windows zip files (e.g. `CesiumGS-cesium-omniverse-linux-x86_64-xxxxxxx.zip` and `CesiumGS-cesium-omniverse-windows-x86_64-xxxxxxx.zip`)
 4. Verify that the Linux package loads in USD Composer (see instructions below).
 5. Verify that the Windows package loads in USD Composer (see instructions below).
 6. Update the project `VERSION` in [CMakeLists.txt](../../CMakeLists.txt).
@@ -21,7 +21,7 @@ This is the process we follow when releasing a new version of Cesium for Omniver
 15. Tag the release, e.g. `git tag -a v0.0.0 -m "0.0.0 release"`.
 16. Push the tag, e.g. `git push origin v0.0.0`.
 17. Wait for CI to pass.
-18. Download the latest build from S3. In the AWS management console (InternalServices AWS account), go to the bucket [`cesium-builds/cesium-omniverse`](https://s3.console.aws.amazon.com/s3/buckets/cesium-builds?prefix=cesium-omniverse/&region=us-east-1), find the folder with the new tag and download the AlmaLinux and Windows zip files (e.g. `CesiumGS-cesium-omniverse-linux-x86_64-v0.0.0.zip` and `CesiumGS-cesium-omniverse-windows-x86_64-v0.0.0.zip` )
+18. Download the latest build from S3. In the AWS management console (InternalServices AWS account), go to the bucket [`cesium-builds/cesium-omniverse`](https://s3.console.aws.amazon.com/s3/buckets/cesium-builds?prefix=cesium-omniverse/&region=us-east-1), find the folder with the new tag and download the Ubuntu 22 and Windows zip files (e.g. `CesiumGS-cesium-omniverse-linux-x86_64-v0.0.0.zip` and `CesiumGS-cesium-omniverse-windows-x86_64-v0.0.0.zip` )
 19. Create a new release on GitHub: https://github.com/CesiumGS/cesium-omniverse/releases/new.
     * Chose the new tag.
     * Copy the changelog into the description. Follow the format used in previous releases.

docs/release-guide/push-docker-image.md

@@ -1,6 +1,6 @@
-# Pushing the Docker Image for AlmaLinux 8 builds.
+# Pushing the Docker Image for Ubuntu 22 builds.
 
-We use a docker image for our AlmaLinux 8 builds that contains all of our build dependencies, so we don't have to build the image from scratch on each build. This document outlines how to build and push this to Docker Hub.
+We use a docker image for our Ubuntu 22 builds that contains all of our build dependencies, so we don't have to build the image from scratch on each build. This document outlines how to build and push this to Docker Hub.
 
 ## Installing Docker
 
@@ -24,7 +24,7 @@ particular, `ssh` logins and `git` may not work anymore.
 
 ## Building the container
 
-Confirm that you have push access to the [container repo](https://hub.docker.com/r/cesiumgs/omniverse-almalinux8-build).
+Confirm that you have push access to the [container repo](https://hub.docker.com/r/cesiumgs/omniverse-ubuntu22-build).
 
 ### Log in
 
@@ -39,7 +39,7 @@ docker login
 After making your changes to the docker file, execute:
 
 ```shell
-docker build --tag cesiumgs/omniverse-almalinux8-build:$TAGNAME -f docker/AlmaLinux8.Dockerfile . --no-cache
+docker build --tag cesiumgs/omniverse-ubuntu22-build:$TAGNAME -f docker/Ubuntu22.Dockerfile . --no-cache
 ```
 
 You should replace `$TAGNAME` with the current date in `YYYY-MM-DD` format. So if it's the 29th of August, 2023, you would use `2023-08-29`.
@@ -49,11 +49,11 @@ You should replace `$TAGNAME` with the current date in `YYYY-MM-DD` format. So i
 The build will take some time. Once it is finished, execute the following to push the image to Docker Hub:
 
 ```shell
-docker push cesiumgs/omniverse-almalinux8-build:$TAGNAME
+docker push cesiumgs/omniverse-ubuntu22-build:$TAGNAME
 ```
 
 Again, you should replace `$TAGNAME` with the current date in `YYYY-MM-DD` format. So if it's the 29th of August, 2023, you would use `2023-08-29`.
 
 ### Update CI.Dockerfile
 
-The `docker/CI.Dockerfile` file is used as part of the AlmaLinux 8 build step in our GitHub actions. You will need to update the version of the Docker image used to the tagged version you just uploaded.
+The `docker/CI.Dockerfile` file is used as part of the Ubuntu 22 build step in our GitHub actions. You will need to update the version of the Docker image used to the tagged version you just uploaded.

scripts/build_package_ubuntu22.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# Make sure to run this script from the root cesium-omniverse directory
+
+# Delete existing build folder
+sudo rm -rf build-package
+
+# Start the docker container
+docker build --tag cesiumgs/cesium-omniverse:ubuntu22 -f docker/Ubuntu22.Dockerfile .
+container_id=$(docker run -it -d --volume $PWD:/var/app cesiumgs/cesium-omniverse:ubuntu22)
+
+# Run package commands inside docker container
+package_cmd="
+cmake -B build-package -D CMAKE_BUILD_TYPE=Release CESIUM_OMNI_ENABLE_TESTS=OFF -D CESIUM_OMNI_ENABLE_DOCUMENTATION=OFF -D CESIUM_OMNI_ENABLE_SANITIZERS=OFF -D CESIUM_OMNI_ENABLE_LINTERS=OFF -D VCPKG_TRIPLET=x64-linux &&
+cmake --build build-package --parallel 8 &&
+cmake --build build-package --target install &&
+cmake --build build-package --target package
+"
+
+docker exec ${container_id} /bin/sh -c "${package_cmd}"
+
+# Clean up
+docker stop ${container_id}
+docker rm ${container_id}