Merge pull request #18 from feltech/work/OpenAssetIO/1351-cy24

Default to CY24 and drop support for CY22

Author: feltech

.github/build_openassetio/action.yml

@@ -11,7 +11,7 @@ runs:
   using: "composite"
   steps:
     - name: Checkout OpenAssetIO
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: OpenAssetIO/OpenAssetIO
         path: openassetio-checkout

.github/build_openassetio_mediacreation/action.yml

@@ -11,7 +11,7 @@ runs:
   using: "composite"
   steps:
     - name: Checkout OpenAssetIO-Mediacreation
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: OpenAssetIO/OpenAssetIO-MediaCreation
         path: openassetio-mediacreation-checkout

.github/dependabot.yml

@@ -7,8 +7,3 @@ updates:
       interval: "weekly"
     commit-message:
       prefix: "[CI]"
-    ignore:
-      # TODO(DF): Remove once no longer stuck on ASWF CY22 Docker image
-      # for CI (causing nodejs glibc error).
-      - dependency-name: "actions/checkout"
-        update-types: ["version-update:semver-major"]

.github/workflows/test.yml

@@ -7,13 +7,6 @@ name: Test
 on:
   pull_request:
 
-env:
-  # Buy some more time to use the deprecated Node 16 (needed for GLIBC
-  # version)
-  # Upgrading to the CY23 Docker images will solve this longer term. See
-  # https://github.com/OpenAssetIO/OpenAssetIO/issues/984#issuecomment-2210792734
-  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
-
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
@@ -25,7 +18,7 @@ jobs:
     container:
       image: ghcr.io/openassetio/openassetio-build
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Build
         uses: ./.github/build_openassetio
 
@@ -35,18 +28,18 @@ jobs:
     container:
       image: ghcr.io/openassetio/openassetio-build
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Build
         uses: ./.github/build_openassetio_mediacreation
 
   test-no-submodule:
     name: Test (OpenAssetIO as package, MediaCreation as package)
     runs-on: ubuntu-latest
     container:
-      image: aswf/ci-vfxall:2022-clang14.3
+      image: aswf/ci-base:2024
     needs: [build-openassetio, build-openassetio-mediacreation]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Get OpenAssetIO
         uses: actions/download-artifact@v3
@@ -79,7 +72,18 @@ jobs:
       image: ghcr.io/openassetio/openassetio-build
     needs: [build-openassetio-mediacreation]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+
+      # TODO(DF): Remove once fixed upstream. Checkout in a container
+      # doesn't use the container's user (appears to use 1001 rather
+      # than root 0) and safe.directory setting is not applied properly.
+      # So submodule update fails.
+      # https://github.com/actions/checkout/issues/1169
+      # The check itself was added to git in
+      # https://github.com/git/git/commit/f4aa8c8bb11dae6e769cd930565173808cbb69c8
+      - name: Work around actions/checkout ownership bug
+        run: |
+          git config --system --add safe.directory $(pwd)
 
       - name: Get OpenAssetIO-MediaCreation
         uses: actions/download-artifact@v3
@@ -109,10 +113,21 @@ jobs:
     name: Test (OpenAssetIO as package, MediaCreation as subproject)
     runs-on: ubuntu-latest
     container:
-      image: aswf/ci-vfxall:2022-clang14.3
+      image: aswf/ci-base:2024
     needs: [build-openassetio]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+
+      # TODO(DF): Remove once fixed upstream. Checkout in a container
+      # doesn't use the container's user (appears to use 1001 rather
+      # than root 0) and safe.directory setting is not applied properly.
+      # So submodule update fails.
+      # https://github.com/actions/checkout/issues/1169
+      # The check itself was added to git in
+      # https://github.com/git/git/commit/f4aa8c8bb11dae6e769cd930565173808cbb69c8
+      - name: Work around actions/checkout ownership bug
+        run: |
+          git config --system --add safe.directory $(pwd)
 
       - name: Get OpenAssetIO
         uses: actions/download-artifact@v3
@@ -146,7 +161,18 @@ jobs:
     container:
       image: ghcr.io/openassetio/openassetio-build
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+
+      # TODO(DF): Remove once fixed upstream. Checkout in a container
+      # doesn't use the container's user (appears to use 1001 rather
+      # than root 0) and safe.directory setting is not applied properly.
+      # So submodule update fails.
+      # https://github.com/actions/checkout/issues/1169
+      # The check itself was added to git in
+      # https://github.com/git/git/commit/f4aa8c8bb11dae6e769cd930565173808cbb69c8
+      - name: Work around actions/checkout ownership bug
+        run: |
+          git config --system --add safe.directory $(pwd)
 
       - name: Install Traitgen
         run: |

CMakeLists.txt

@@ -31,17 +31,9 @@ option(OPENASSETIO_MEDIACREATIONTEST_ENABLE_SUBPROJECT
 option(OPENASSETIOTEST_ENABLE_PYTHON "Test Python bindings" ON)
 option(OPENASSETIOTEST_ENABLE_C "Test C bindings" ON)
 
-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND
-    CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 5.0)
-    option(OPENASSETIOTEST_GLIBCXX_USE_CXX11_ABI "For gcc, use the new C++11 library ABI" OFF)
-endif ()
-
 if (CMAKE_TOOLCHAIN_FILE)
     message(STATUS "Using toolchain file                = ${CMAKE_TOOLCHAIN_FILE}")
 endif ()
-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-    message(STATUS "New C++11 ABI for GCC               = ${OPENASSETIOTEST_GLIBCXX_USE_CXX11_ABI}")
-endif ()
 message(STATUS "Testing OpenAssetIO as a subproject = ${OPENASSETIOTEST_ENABLE_OPENASSETIO_SUBPROJECT}")
 message(STATUS "Testing OpenAssetIO-MediaCreation as a subproject = "
                "${OPENASSETIOTEST_ENABLE_MEDIACREATION_SUBPROJECT}")
@@ -100,15 +92,6 @@ add_test(cpp.core test.cpp.core)
 target_link_libraries(test.cpp.core PRIVATE OpenAssetIO::openassetio-core)
 target_compile_features(test.cpp.core PRIVATE cxx_std_17)
 
-# GCC's C++11 ABI toggle must match OpenAssetIO's settings.
-if (DEFINED OPENASSETIOTEST_GLIBCXX_USE_CXX11_ABI)
-    if (OPENASSETIOTEST_GLIBCXX_USE_CXX11_ABI)
-        target_compile_definitions(test.cpp.core PRIVATE _GLIBCXX_USE_CXX11_ABI=1)
-    else ()
-        target_compile_definitions(test.cpp.core PRIVATE _GLIBCXX_USE_CXX11_ABI=0)
-    endif ()
-endif ()
-
 if (WIN32 AND DEFINED OpenAssetIO_BINARY_DIR)
     set_tests_properties(cpp.core PROPERTIES ENVIRONMENT "PATH=${OpenAssetIO_BINARY_DIR_NATIVE}")
 endif ()
@@ -121,15 +104,6 @@ add_test(cpp.mediacreation test.cpp.mediacreation)
 target_link_libraries(test.cpp.mediacreation PRIVATE OpenAssetIO::openassetio-core OpenAssetIO-MediaCreation::openassetio-mediacreation)
 target_compile_features(test.cpp.mediacreation PRIVATE cxx_std_17)
 
-# GCC's C++11 ABI toggle must match OpenAssetIO's settings.
-if (DEFINED OPENASSETIOTEST_GLIBCXX_USE_CXX11_ABI)
-    if (OPENASSETIOTEST_GLIBCXX_USE_CXX11_ABI)
-        target_compile_definitions(test.cpp.mediacreation PRIVATE _GLIBCXX_USE_CXX11_ABI=1)
-    else ()
-        target_compile_definitions(test.cpp.mediacreation PRIVATE _GLIBCXX_USE_CXX11_ABI=0)
-    endif ()
-endif ()
-
 if (WIN32 AND DEFINED OpenAssetIO_BINARY_DIR)
     set_tests_properties(cpp.mediacreation PROPERTIES ENVIRONMENT "PATH=${OpenAssetIO_BINARY_DIR_NATIVE}")
 endif ()
@@ -225,9 +199,9 @@ if (OPENASSETIOTEST_ENABLE_PYTHON)
     # Fix library search path on MacOS.
     if (APPLE)
         # The `Python::Python` target's link options are set to e.g
-        # `@rpath/Python.framework/Versions/3.9/Python` but all our
+        # `@rpath/Python.framework/Versions/3.10/Python` but all our
         # target's (CMake generated) @rpaths already contain
-        # `Python.framework/Versions/3.9`. So add another RPATH with
+        # `Python.framework/Versions/3.10`. So add another RPATH with
         # the framework subdirectories stripped. This then allows our
         # test target to find the Python library.
         set_target_properties(test.python.bridge PROPERTIES BUILD_RPATH ${Python_PREFIX}/../../..)