Dev (#44)

* Wrapper: Update for allocator changes (#40) * Update nightly.yaml * Update release.yml * Update release.yml * Update nightly.yaml Co-authored-by: Owen Green <[email protected]>
flucoma · Dec 15, 2022 · fab75e7 · fab75e7
1 parent c2767c2
commit fab75e7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml
@@ -57,7 +57,7 @@ jobs:
           path: release-packaging/FluCoMa-CLI-Mac-nightly.dmg
 
   linux:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v3
       - uses: flucoma/actions/env@main
@@ -75,7 +75,7 @@ jobs:
           path: release-packaging/FluCoMa-CLI-Linux-nightly.tar.gz
 
   release:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     needs: [windows, linux, macos]
     steps:
       - uses: actions/download-artifact@v2

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -50,7 +50,7 @@ jobs:
           path: release-packaging/FluCoMa-CLI-Mac.dmg
 
   linux:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     outputs:
       version: ${{ steps.get-version.outputs.version }}
     steps:
@@ -76,7 +76,7 @@ jobs:
         working-directory: build/_deps/flucoma-core-src
 
   release:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     needs: [mac, windows, linux]
 
     steps:

diff --git a/include/FluidCLIWrapper.hpp b/include/FluidCLIWrapper.hpp
@@ -16,6 +16,7 @@ under the European Union’s Horizon 2020 research and innovation programme
 #include <clients/common/OfflineClient.hpp>
 #include <clients/common/ParameterSet.hpp>
 #include <clients/common/ParameterTypes.hpp>
+#include <data/FluidMemory.hpp>
 #include <FluidVersion.hpp>
 #include <cctype>
 #include <chrono>
@@ -402,7 +403,7 @@ class CLIWrapper
 
   static int run(index argc, const char* argv[])
   {
-    ParamSetType params(descriptors());
+    ParamSetType params(descriptors(), FluidDefaultAllocator());
     FlagsType    flags;
     flags.fill(false);
 
@@ -460,8 +461,8 @@ class CLIWrapper
 
     // Create client after all parameters are set
 
-    ClientType   client(params);
-    Result result;
+    ClientType client(params, FluidContext());
+    Result     result;
 
     client.enqueue(params);
     result = client.process();