diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml index 78fe701..a96aa5b 100644 --- a/.github/workflows/nightly.yaml +++ b/.github/workflows/nightly.yaml @@ -32,7 +32,7 @@ jobs: apppwd: ${{ secrets.APPSTORECONNECTPWD }} appusr: ${{ secrets.APPSTORECONNECTUSERNAME }} - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4.3.6 with: name: macbuild path: install/FluCoMa-SC-Mac-nightly.dmg @@ -53,7 +53,7 @@ jobs: run: 7z a FluCoMa-SC-Windows-nightly.zip FluidCorpusManipulation working-directory: install - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4.3.6 with: name: winbuild path: install/FluCoMa-SC-Windows-nightly.zip @@ -71,7 +71,7 @@ jobs: - name: compress archive run: tar -zcvf FluCoMa-SC-Linux-nightly.tar.gz FluidCorpusManipulation working-directory: install - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4.3.6 with: name: linuxbuild path: install/FluCoMa-SC-Linux-nightly.tar.gz @@ -81,15 +81,15 @@ jobs: needs: [macbuild, winbuild, linuxbuild] steps: - - uses: actions/download-artifact@v2 + - uses: actions/download-artifact@v4.1.7 with: name: macbuild - - uses: actions/download-artifact@v2 + - uses: actions/download-artifact@v4.1.7 with: name: winbuild - - uses: actions/download-artifact@v2 + - uses: actions/download-artifact@v4.1.7 with: name: linuxbuild diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5e03eb2..0edc689 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,7 +26,7 @@ jobs: apppwd: ${{ secrets.APPSTORECONNECTPWD }} appusr: ${{ secrets.APPSTORECONNECTUSERNAME }} - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4.3.6 with: name: macbuild path: install/FluCoMa-SC-Mac.dmg @@ -47,7 +47,7 @@ jobs: run: 7z a FluCoMa-SC-Windows.zip FluidCorpusManipulation working-directory: install - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4.3.6 with: name: winbuild path: install/FluCoMa-SC-Windows.zip @@ -67,7 +67,7 @@ jobs: run: tar -zcvf FluCoMa-SC-Linux.tar.gz FluidCorpusManipulation working-directory: install - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4.3.6 with: name: linuxbuild path: install/FluCoMa-SC-Linux.tar.gz @@ -81,15 +81,15 @@ jobs: needs: [macbuild, winbuild, linuxbuild] steps: - - uses: actions/download-artifact@v2 + - uses: actions/download-artifact@v4.1.7 with: name: macbuild - - uses: actions/download-artifact@v2 + - uses: actions/download-artifact@v4.1.7 with: name: winbuild - - uses: actions/download-artifact@v2 + - uses: actions/download-artifact@v4.1.7 with: name: linuxbuild diff --git a/CMakeLists.txt b/CMakeLists.txt index 0610452..75fe4aa 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,7 +27,7 @@ set(FLUID_PATH "" CACHE PATH "Optional path to the Fluid Decomposition repo") if (APPLE) set(CMAKE_XCODE_GENERATE_SCHEME ON) - set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8" CACHE STRING "") + set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "") #A consequence of targetting 10.8. Needs to be set globally from 10.15 onwards in order for the test program to compile successfully during configure string(APPEND CMAKE_CXX_FLAGS " -stdlib=libc++") endif() diff --git a/release-packaging/Classes/FluidDataSetQuery.sc b/release-packaging/Classes/FluidDataSetQuery.sc index 1151da7..299f8f9 100644 --- a/release-packaging/Classes/FluidDataSetQuery.sc +++ b/release-packaging/Classes/FluidDataSetQuery.sc @@ -55,13 +55,13 @@ FluidDataSetQuery : FluidDataObject { this.prSendMsg(this.clearMsg); } - limitMsg{|rows| - ^this.prMakeMsg(\limit,id,rows); + limitMsg{|points| + ^this.prMakeMsg(\limit,id,points); } - limit{|rows, action| + limit{|points, action| actions[\limit] = [nil,action]; - this.prSendMsg(this.limitMsg(rows)); + this.prSendMsg(this.limitMsg(points)); } transformMsg{|sourceDataSet, destDataSet|