Fix build pipeline and shit

Akademiaapp · Oct 8, 2024 · 24678ff · 24678ff
1 parent cba6f6b
commit 24678ff
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -41,8 +41,8 @@ jobs:
         run: |
           sudo apt install jq
           sed -i '0,/\(version *= *\).*/s//\1"${{ steps.semver.outputs.semantic-version }}"/' src-tauri/Cargo.toml
-          jq '.package.version="${{ steps.semver.outputs.semantic-version }}"' src-tauri/tauri.conf.json > tauri.config.json.new && mv tauri.config.json.new src-tauri/tauri.conf.json
-          sed -i '/name = "akademia"/{N;s/\(version *= *\)".*"/\1"'"${{ steps.semver.outputs.semantic-version }}"'"/;}' src-tauri/Cargo.lock
+          jq '.version="${{ steps.semver.outputs.semantic-version }}"' src-tauri/tauri.conf.json > tauri.config.json.new && mv tauri.config.json.new src-tauri/tauri.conf.json
+          sed -i '/name = "music-assistant-companion"/{N;s/\(version *= *\)".*"/\1"'"${{ steps.semver.outputs.semantic-version }}"'"/;}' src-tauri/Cargo.lock
 
       - name: Commit and push changes
         run: |
@@ -78,7 +78,7 @@ jobs:
         if: matrix.platform == 'ubuntu-20.04'
         run: |
           sudo apt-get update
-          sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev librsvg2-dev libayatana-appindicator3-dev
+          sudo apt-get install -y libwebkit2gtk-4.1-dev build-essential curl wget file libxdo-dev libssl-dev libayatana-appindicator3-dev librsvg2-dev libsoup2.4-dev libjavascriptcoregtk-4.1-dev libxcb-xfixes0-dev libxcb-shape0-dev patchelf
 
       - name: Install Rust (Stable)
         run:

diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -29,4 +29,4 @@ custom-protocol = ["tauri/custom-protocol"]
 
 [lib]
 name = "app_lib"
-crate-type = ["staticlib", "cdylib", "rlib", "lib"]
+crate-type = ["staticlib", "cdylib", "rlib"]
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -12,7 +12,9 @@
       "appimage",
       "nsis",
       "app",
-      "dmg"
+      "dmg",
+      "rpm",
+      "msi"
     ],
     "icon": [
       "icons/32x32.png",
@@ -21,12 +23,12 @@
       "icons/icon.icns",
       "icons/icon.ico"
     ],
-    "createUpdaterArtifacts": "v1Compatible"
+    "createUpdaterArtifacts": true
   },
   "productName": "Akademia",
   "mainBinaryName": "Akademia",
-  "version": "0.0.58",
-  "identifier": "dk.akademiaapp.companion",
+  "version": "0.0.59",
+  "identifier": "cc.akademia.companion",
   "plugins": {
     "updater": {
       "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDhGRjk2QTc1MzE4QkIyOUQKUldTZHNvc3hkV3I1anpkTy90SnVlaUZoanViMVZBZmROTDhFMXdxNmQxNkJqRW1mU3hMREtSL2MK",