[ENG-927, ENG-735, ENG-766] Fix Updater & Tauri 1.5

.cargo/config.toml.mustache

@@ -2,48 +2,48 @@
 {{#protoc}}
 PROTOC = "{{{protoc}}}"
 {{/protoc}}
-{{#ffmpeg}}
-FFMPEG_DIR = "{{{ffmpeg}}}"
-{{/ffmpeg}}
+{{^isLinux}}
+FFMPEG_DIR = "{{{nativeDeps}}}"
+{{/isLinux}}
 
 {{#isMacOS}}
 [target.x86_64-apple-darwin]
-rustflags = ["-L", "{{{projectRoot}}}/target/Frameworks/lib"]
+rustflags = ["-L", "{{{nativeDeps}}}/lib"]
 
 [target.x86_64-apple-darwin.heif]
-rustc-link-search = ["{{{projectRoot}}}/target/Frameworks/lib"]
+rustc-link-search = ["{{{nativeDeps}}}/lib"]
 rustc-link-lib = ["heif"]
 
 [target.aarch64-apple-darwin]
-rustflags = ["-L", "{{{projectRoot}}}/target/Frameworks/lib"]
+rustflags = ["-L", "{{{nativeDeps}}}/lib"]
 
 [target.aarch64-apple-darwin.heif]
-rustc-link-search = ["{{{projectRoot}}}/target/Frameworks/lib"]
+rustc-link-search = ["{{{nativeDeps}}}/lib"]
 rustc-link-lib = ["heif"]
 {{/isMacOS}}
 
 {{#isWin}}
 [target.x86_64-pc-windows-msvc]
-rustflags = ["-L", "{{{projectRoot}}}\\target\\Frameworks\\lib"]
+rustflags = ["-L", "{{{nativeDeps}}}\\lib"]
 
 [target.x86_64-pc-windows-msvc.heif]
-rustc-link-search = ["{{{projectRoot}}}\\target\\Frameworks\\lib"]
+rustc-link-search = ["{{{nativeDeps}}}\\lib"]
 rustc-link-lib = ["heif"]
 {{/isWin}}
 
 {{#isLinux}}
 [target.x86_64-unknown-linux-gnu]
-rustflags = ["-L", "{{{projectRoot}}}/target/Frameworks/lib", "-C", "link-arg=-Wl,-rpath=${ORIGIN}/../lib/spacedrive"]
+rustflags = ["-L", "{{{nativeDeps}}}/lib", "-C", "link-arg=-Wl,-rpath=${ORIGIN}/../lib/spacedrive"]
 
 [target.x86_64-unknown-linux-gnu.heif]
-rustc-link-search = ["{{{projectRoot}}}/target/Frameworks/lib"]
+rustc-link-search = ["{{{nativeDeps}}}/lib"]
 rustc-link-lib = ["heif"]
 
 [target.aarch64-unknown-linux-gnu]
-rustflags = ["-L", "{{{projectRoot}}}/target/Frameworks/lib", "-C", "link-arg=-Wl,-rpath=${ORIGIN}/../lib/spacedrive"]
+rustflags = ["-L", "{{{nativeDeps}}}/lib", "-C", "link-arg=-Wl,-rpath=${ORIGIN}/../lib/spacedrive"]
 
 [target.aarch64-unknown-linux-gnu.heif]
-rustc-link-search = ["{{{projectRoot}}}/target/Frameworks/lib"]
+rustc-link-search = ["{{{nativeDeps}}}/lib"]
 rustc-link-lib = ["heif"]
 {{/isLinux}}
 

.github/actions/publish-artifacts/action.yaml

@@ -23,14 +23,14 @@ runs:
         if-no-files-found: error
         retention-days: 1
 
-    # - name: Publish artifacts (Debian - deb)
-    #   if: ${{ matrix.settings.host == 'ubuntu-20.04' }}
-    #   uses: actions/upload-artifact@v3
-    #   with:
-    #     name: Spacedrive-deb-${{ inputs.target }}-${{ env.GITHUB_SHA_SHORT }}
-    #     path: target/${{ inputs.target }}/${{ inputs.profile }}/bundle/deb/*.deb
-    #     if-no-files-found: error
-    #     retention-days: 1
+    - name: Publish artifacts (Debian - deb)
+      if: ${{ matrix.settings.host == 'ubuntu-20.04' }}
+      uses: actions/upload-artifact@v3
+      with:
+        name: Spacedrive-deb-${{ inputs.target }}-${{ env.GITHUB_SHA_SHORT }}
+        path: target/${{ inputs.target }}/${{ inputs.profile }}/bundle/deb/*.deb
+        if-no-files-found: error
+        retention-days: 1
 
     - name: Publish artifacts (Windows - msi)
       if: ${{ matrix.settings.host == 'windows-latest' }}
@@ -50,13 +50,13 @@ runs:
         if-no-files-found: error
         retention-days: 1
 
-    # - name: Publish updater binaries
-    #   uses: actions/upload-artifact@v3
-    #   with:
-    #     name: Spacedrive-Updaters-${{ inputs.target }}-${{ env.GITHUB_SHA_SHORT }}
-    #     path: |
-    #       target/${{ inputs.target }}/${{ inputs.profile }}/bundle/**/*.tar.gz*
-    #       target/${{ inputs.target }}/${{ inputs.profile }}/bundle/**/*.zip*
-    #       !target/**/deb/**/*.tar.gz
-    #     if-no-files-found: error
-    #     retention-days: 1
+    - name: Publish updater binaries
+      uses: actions/upload-artifact@v3
+      with:
+        name: Spacedrive-Updaters-${{ inputs.target }}-${{ env.GITHUB_SHA_SHORT }}
+        path: |
+          target/${{ inputs.target }}/${{ inputs.profile }}/bundle/**/*.tar.gz*
+          target/${{ inputs.target }}/${{ inputs.profile }}/bundle/**/*.zip*
+          !target/**/deb/**/*.tar.gz
+        if-no-files-found: error
+        retention-days: 1

.github/actions/setup-system/action.yml

@@ -64,7 +64,7 @@ runs:
         TARGET_TRIPLE: ${{ inputs.target }}
         GITHUB_TOKEN: ${{ inputs.token }}
       run: |
-        pushd ..
-        npm i archive-wasm mustache
+        pushd scripts
+        npm i --production
         popd
         node scripts/preprep.mjs

.github/workflows/release.yml

@@ -24,11 +24,12 @@ jobs:
           #   target: aarch64-pc-windows-msvc
           - host: ubuntu-20.04
             target: x86_64-unknown-linux-gnu
-            bundles: appimage
+            bundles: appimage,deb
           # - host: ubuntu-20.04
           #   target: x86_64-unknown-linux-musl
           # - host: ubuntu-20.04
           #   target: aarch64-unknown-linux-gnu
+          #   bundles: deb # no appimage for now unfortunetly
           # - host: ubuntu-20.04
           #   target: aarch64-unknown-linux-musl
           # - host: ubuntu-20.04
@@ -95,7 +96,7 @@ jobs:
 
       - name: Build
         run: |
-          pnpm tauri build --ci -v --target ${{ matrix.settings.target }} --bundles ${{ matrix.settings.bundles }}
+          pnpm tauri build --ci -v --target ${{ matrix.settings.target }} --bundles ${{ matrix.settings.bundles }},updater
         env:
           TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
           TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
@@ -107,7 +108,6 @@ jobs:
           APPLE_API_ISSUER: ${{ secrets.APPLE_API_ISSUER }}
           APPLE_API_KEY: ${{ secrets.APPLE_API_KEY }}
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-          NODE_OPTIONS: --max-old-space-size=4096
 
       - name: Publish Artifacts
         uses: ./.github/actions/publish-artifacts

.github/workflows/server.yml

@@ -61,7 +61,6 @@ jobs:
           build-args: |
             REPO=${{ steps.image_info.outputs.repo }}
             REPO_REF=${{ steps.image_info.outputs.repo_ref }}
-            NODE_OPTIONS: "--max-old-space-size=4096"
           containerfiles: |
             ./apps/server/docker/Dockerfile
 

.gitignore

@@ -25,6 +25,7 @@ packages/*/node_modules
 packages/*/data
 apps/*/data
 apps/*/stats.html
+apps/.deps
 apps/releases/.vscode
 apps/desktop/src-tauri/tauri.conf.patch.json
 apps/desktop/src-tauri/*.dll
@@ -78,7 +79,6 @@ dev.db-journal
 sd_init.json
 
 spacedrive
-scripts/.tmp
 .cargo/config
 .cargo/config.toml
 .github/scripts/deps