diff --git a/.github/workflows/build-with-kokkos.yml b/.github/workflows/build-with-kokkos.yml
index ad56034b1..4cd75eafa 100644
--- a/.github/workflows/build-with-kokkos.yml
+++ b/.github/workflows/build-with-kokkos.yml
@@ -38,6 +38,9 @@ jobs:
           repository: kokkos/kokkos
           path: kokkos
           ref: develop
+      - name: Ensure non-interactive frontend.
+        run : |
+          echo "DEBIAN_FRONTEND=noninteractive" >> $GITHUB_ENV
       - name: Install compilers
         run : |
           apt update
@@ -71,6 +74,18 @@ jobs:
                   exit -1
           esac
 
+      # Add Kitware's APT source to get the latest CMake version (or at least newer than 3.19 to support JSON presets).
+      # See also https://apt.kitware.com/.
+      - name: Add Kitware's APT source to get the latest CMake version.
+        run : |
+          apt --yes --no-install-recommends install wget lsb-release ca-certificates gnupg
+          wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null
+          echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ $(lsb_release -sc) main" | tee /etc/apt/sources.list.d/kitware.list >/dev/null
+          apt update
+          rm /usr/share/keyrings/kitware-archive-keyring.gpg
+          apt --no-install-recommends --yes install kitware-archive-keyring
+          apt policy cmake
+
       - name: Install git, CMake, OpenMPI, PAPI and dtrace
         run: |
           apt --yes --no-install-recommends install \
diff --git a/profiling/perfetto-connector/perfetto/perfetto.cc b/profiling/perfetto-connector/perfetto/perfetto.cc
index 335771271..bb779faeb 100644
--- a/profiling/perfetto-connector/perfetto/perfetto.cc
+++ b/profiling/perfetto-connector/perfetto/perfetto.cc
@@ -49830,7 +49830,7 @@ constexpr uint8_t kChunkNeedsPatching =
 }  // namespace.
 
 constexpr size_t TraceBuffer::ChunkRecord::kMaxSize;
-constexpr size_t TraceBuffer::InlineChunkHeaderSize = sizeof(ChunkRecord);
+const size_t TraceBuffer::InlineChunkHeaderSize = sizeof(ChunkRecord);
 
 // static
 std::unique_ptr<TraceBuffer> TraceBuffer::Create(size_t size_in_bytes,
diff --git a/profiling/perfetto-connector/perfetto/perfetto.h b/profiling/perfetto-connector/perfetto/perfetto.h
index 689177f9b..41a528675 100644
--- a/profiling/perfetto-connector/perfetto/perfetto.h
+++ b/profiling/perfetto-connector/perfetto/perfetto.h
@@ -6318,7 +6318,16 @@ enum TraceConfig_LockdownModeOperation : int;
 enum TraceConfig_CompressionType : int;
 enum TraceConfig_StatsdLogging : int;
 enum TraceConfig_TriggerConfig_TriggerMode : int;
-enum BuiltinClock : int;
+enum BuiltinClock : int {
+  BUILTIN_CLOCK_UNKNOWN = 0,
+  BUILTIN_CLOCK_REALTIME = 1,
+  BUILTIN_CLOCK_REALTIME_COARSE = 2,
+  BUILTIN_CLOCK_MONOTONIC = 3,
+  BUILTIN_CLOCK_MONOTONIC_COARSE = 4,
+  BUILTIN_CLOCK_MONOTONIC_RAW = 5,
+  BUILTIN_CLOCK_BOOTTIME = 6,
+  BUILTIN_CLOCK_MAX_ID = 63,
+};
 enum DataSourceConfig_SessionInitiator : int;
 enum ChromeConfig_ClientPriority : int;
 enum TraceConfig_BufferConfig_FillPolicy : int;
@@ -19744,34 +19753,11 @@ enum AndroidLogPriority : int {
 // gen_amalgamated expanded: #include "perfetto/protozero/copyable_ptr.h"
 // gen_amalgamated expanded: #include "perfetto/base/export.h"
 
-namespace perfetto {
-namespace protos {
-namespace gen {
-enum BuiltinClock : int;
-}  // namespace perfetto
-}  // namespace protos
-}  // namespace gen
 
 namespace protozero {
 class Message;
 }  // namespace protozero
 
-namespace perfetto {
-namespace protos {
-namespace gen {
-enum BuiltinClock : int {
-  BUILTIN_CLOCK_UNKNOWN = 0,
-  BUILTIN_CLOCK_REALTIME = 1,
-  BUILTIN_CLOCK_REALTIME_COARSE = 2,
-  BUILTIN_CLOCK_MONOTONIC = 3,
-  BUILTIN_CLOCK_MONOTONIC_COARSE = 4,
-  BUILTIN_CLOCK_MONOTONIC_RAW = 5,
-  BUILTIN_CLOCK_BOOTTIME = 6,
-  BUILTIN_CLOCK_MAX_ID = 63,
-};
-}  // namespace perfetto
-}  // namespace protos
-}  // namespace gen
 
 #endif  // PERFETTO_PROTOS_PROTOS_PERFETTO_COMMON_BUILTIN_CLOCK_PROTO_CPP_H_
 // gen_amalgamated begin header: gen/protos/perfetto/common/commit_data_request.gen.h