Merge branch 'upmain' into updev

# Conflicts:
#	.github/workflows/release.yml

.github/workflows/release.yml

@@ -14,13 +14,13 @@ jobs:
           branch: origin/main
 
       - name: compress archive
-        run: zip -r FluCoMa-SC-Mac-nightly.zip FluidCorpusManipulation
+        run: zip -r FluCoMa-SC-Mac.zip FluidCorpusManipulation
         working-directory: install
 
       - uses: actions/upload-artifact@v2
         with:
           name: macbuild
-          path: install/FluCoMa-SC-Mac-nightly.zip
+          path: install/FluCoMa-SC-Mac.zip
 
   winbuild:
     runs-on: windows-latest
@@ -35,13 +35,13 @@ jobs:
         run: Remove-Item install -Recurse -Include *.pdb
 
       - name: compress archive
-        run: 7z a FluCoMa-SC-Windows-nightly.zip FluidCorpusManipulation
+        run: 7z a FluCoMa-SC-Windows.zip FluidCorpusManipulation
         working-directory: install
 
       - uses: actions/upload-artifact@v2 
         with: 
           name: winbuild
-          path: install/FluCoMa-SC-Windows-nightly.zip 
+          path: install/FluCoMa-SC-Windows.zip 
 
   linuxbuild:
     runs-on: ubuntu-18.04
@@ -55,17 +55,17 @@ jobs:
           branch: origin/main
 
       - name: compress archive
-        run: tar -zcvf FluCoMa-SC-Linux-nightly.tar.gz FluidCorpusManipulation
+        run: tar -zcvf FluCoMa-SC-Linux.tar.gz FluidCorpusManipulation
         working-directory: install
 
       - uses: actions/upload-artifact@v2
         with:
           name: linuxbuild 
-          path: install/FluCoMa-SC-Linux-nightly.tar.gz
+          path: install/FluCoMa-SC-Linux.tar.gz
           
       - id: get-version
         run: echo "::set-output name=version::$(cat flucoma.version.rc)"
-        working-directory: core
+        working-directory: build/_deps/flucoma-core-src
   
   release:
     runs-on: ubuntu-latest
@@ -89,7 +89,7 @@ jobs:
         with:
           name: ${{ needs.linuxbuild.outputs.version }}
           body: "This is a release build of the FluCoMa SuperCollider package. The build hash is ${{ github.sha }}"
-          files: FluCoMa-SC-*.zip
+          files: FluCoMa*
           prerelease: true
           tag_name: ${{ needs.linuxbuild.outputs.version }}
           draft: false