From 0c29fe9f71b23977a4da817324b2cb3202c36ce0 Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Wed, 4 Dec 2024 09:20:06 +0000 Subject: [PATCH 1/2] HPCC-33071 GH Actions, bump macos versions macos-12 has been deprecated see: https://github.com/actions/runner-images/issues/10721 Signed-off-by: Gordon Smith --- .github/workflows/build-assets.yml | 2 +- .github/workflows/build-vcpkg.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-assets.yml b/.github/workflows/build-assets.yml index c5b568f8821..a5d581a6ce6 100644 --- a/.github/workflows/build-assets.yml +++ b/.github/workflows/build-assets.yml @@ -394,7 +394,7 @@ jobs: sudo: "" cmake_config_options: '-T host=x64 -A x64 -DUSE_OPTIONAL=OFF -DCLIENTTOOLS_ONLY=ON -DUSE_AZURE=OFF -DUSE_CASSANDRA=OFF -DUSE_JAVA=OFF -DUSE_OPENLDAP=OFF' cmake_build_options: "--config Release --parallel $NUMBER_OF_PROCESSORS" - - os: "macos-12" + - os: "macos-13" mono: "mono" sudo: "sudo" cmake_config_options: "-DCMAKE_BUILD_TYPE=Release -DUSE_OPTIONAL=OFF -DCLIENTTOOLS_ONLY=ON -DUSE_AZURE=OFF -DUSE_CASSANDRA=OFF -DUSE_JAVA=OFF -DUSE_OPENLDAP=OFF" diff --git a/.github/workflows/build-vcpkg.yml b/.github/workflows/build-vcpkg.yml index 6836d135c8f..6edc30aee79 100644 --- a/.github/workflows/build-vcpkg.yml +++ b/.github/workflows/build-vcpkg.yml @@ -251,13 +251,13 @@ jobs: cmake_config_options: '-T host=x64 -A x64 -DUSE_OPTIONAL=OFF -DCLIENTTOOLS_ONLY=ON -DUSE_AZURE=OFF -DUSE_CASSANDRA=OFF -DUSE_JAVA=OFF -DUSE_OPENLDAP=OFF' cmake_build_options: "--config Release --parallel $NUMBER_OF_PROCESSORS" event_name: "pull_request" - - os: "macos-11" + - os: "macos-13" mono: "mono" sudo: "sudo" cmake_config_options: "-DCMAKE_BUILD_TYPE=Release -DUSE_OPTIONAL=OFF -DCLIENTTOOLS_ONLY=ON -DUSE_AZURE=OFF -DUSE_JAVA=OFF -DUSE_OPENLDAP=OFF" cmake_build_options: "--parallel $(nproc)" event_name: "schedule" - - os: "macos-12" + - os: "macos-14" mono: "mono" sudo: "sudo" cmake_config_options: "-DCMAKE_BUILD_TYPE=Release -DUSE_OPTIONAL=OFF -DCLIENTTOOLS_ONLY=ON -DUSE_AZURE=OFF -DUSE_CASSANDRA=OFF -DUSE_JAVA=OFF -DUSE_OPENLDAP=OFF" From 779e824f5fc5ef667246822dbaa8382b97e90ae0 Mon Sep 17 00:00:00 2001 From: Gavin Halliday Date: Wed, 4 Dec 2024 16:00:21 +0000 Subject: [PATCH 2/2] HPCC-33073 Fix error in unittests caused by getPlaneAttributeValue(nullptr) Signed-off-by: Gavin Halliday --- system/jlib/jfile.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/system/jlib/jfile.cpp b/system/jlib/jfile.cpp index ed913cd2ebf..9235d5470ba 100644 --- a/system/jlib/jfile.cpp +++ b/system/jlib/jfile.cpp @@ -7998,6 +7998,8 @@ const char *getPlaneAttributeString(PlaneAttributeType attr) unsigned __int64 getPlaneAttributeValue(const char *planeName, PlaneAttributeType planeAttrType, unsigned __int64 defaultValue) { + if (!planeName) + return defaultValue; assertex(planeAttrType < PlaneAttributeCount); CriticalBlock b(planeAttributeMapCrit); auto it = planeAttributesMap.find(planeName);