[ci] More fixes

celtera · Sep 16, 2023 · 8159a53 · 8159a53
1 parent b295112
commit 8159a53
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml
@@ -25,6 +25,7 @@ jobs:
               build_flags: "",
               dependencies: "choco install -y ninja",
               sdk: "/c/ossia-sdk",
+              pre_build: ""
             }
           - {
               name: "Ubuntu (clang)",
@@ -46,6 +47,7 @@ jobs:
                              sudo apt update ; \
                              sudo apt install ninja-build clang-15 lld-15 libc++-15-dev libc++1-15 libc++abi1-15 libc++abi-15-dev",
               sdk: "/opt/ossia-sdk",
+              pre_build: ""
             }
           - {
               name: "Ubuntu (GCC)",
@@ -61,15 +63,17 @@ jobs:
                              sudo apt update ; \
                              sudo apt install ninja-build gcc-12 g++-12",
               sdk: "/opt/ossia-sdk",
+              pre_build: ""
             }
           - {
               name: "macOS",
-              os: macos-latest,
+              os: macos-13,
               common_flags: "",
               debug_flags: "-DCMAKE_BUILD_TYPE=Debug",
               release_flags: "-DCMAKE_BUILD_TYPE=Release",
               build_flags: "",
               sdk: "/opt/ossia-sdk-x86_64",
+              pre_build: "xcode-select -s /Applications/Xcode_15.0.app"
             }
 
     steps:
@@ -121,6 +125,8 @@ jobs:
           export SDK_3RDPARTY=$PWD/../score/3rdparty
           export VERBOSE=1
 
+          ${{ matrix.config.pre_build }}
+
           cmake .. \
             -DBOOST_ROOT=${{ matrix.config.sdk }}/boost \
             -Dpybind11_DIR=$SDK_3RDPARTY/libossia/3rdparty/pybind11 \
@@ -157,6 +163,8 @@ jobs:
           export SDK_3RDPARTY=$PWD/../score/3rdparty
           export VERBOSE=1
 
+          ${{ matrix.config.pre_build }}
+
           cmake .. \
             -DBOOST_ROOT=${{ matrix.config.sdk }}/boost \
             -Dpybind11_DIR=$SDK_3RDPARTY/libossia/3rdparty/pybind11 \

diff --git a/cmake/avendish.cmake b/cmake/avendish.cmake
@@ -1,7 +1,7 @@
 include(CMakeFindDependencyMacro)
 
 set(CMAKE_INCLUDE_CURRENT_DIR 1)
-set(CMAKE_CXX_STANDARD 23)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(AVND_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
 set(AVND_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}" CACHE INTERNAL "")

diff --git a/cmake/avendish.sources.cmake b/cmake/avendish.sources.cmake
@@ -1,7 +1,6 @@
 add_library(Avendish)
 add_library(Avendish::Avendish ALIAS Avendish)
 
-
 if(MSVC)
   target_compile_options(Avendish
       PUBLIC

diff --git a/include/avnd/binding/max/from_atoms.hpp b/include/avnd/binding/max/from_atoms.hpp
@@ -47,7 +47,7 @@ struct from_atom
             return true;
           }
           #else
-          std::string_view str{sym->s_name, sym->s_name + strlen(sym->s_name)};
+          std::string_view str{sym->s_name, strlen(sym->s_name)};
           if(boost::conversion::try_lexical_convert(str, vv))
           {
             v = vv;
@@ -94,7 +94,7 @@ struct from_atoms
     requires std::is_enum_v<T>
   bool operator()(T& v) const noexcept
   {
-    auto r = std::to_underlying(v);
+    auto r = static_cast<std::underlying_type_t<T>>(v);
     auto res = from_atom{av[0]}(r);
     if(res)
       v = static_cast<T>(r);

diff --git a/include/avnd/binding/max/outputs.hpp b/include/avnd/binding/max/outputs.hpp
@@ -144,7 +144,8 @@ struct outputs
           });
 
       out_k = N;
-      for(auto name : std::ranges::reverse_view(names)) {
+      for(auto it = names.crbegin(); it != names.crend(); ++it) {
+        const auto& name = *it;
         outlets[--out_k] = static_cast<t_outlet*>(outlet_new(&x_obj, name->s_name));
       }