Merge pull request #66 from cloudnautique/main

fix - version string in tauri
rubra-ai · Feb 16, 2024 · 63c64e5 · 63c64e5
2 parents 491a950 + 38d74a5
commit 63c64e5
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 18 deletions.
diff --git a/.github/workflows/main-release.yaml b/.github/workflows/main-release.yaml
@@ -55,7 +55,7 @@ jobs:
       - name: Rust Cache
         uses: swatinem/rust-cache@v2
         with:
-          workspaces: "./tauri/src-tauri -> target"
+          workspaces: "./tauri/src-tauri"
 
       - name: Set up Nodejs
         uses: actions/setup-node@v4

diff --git a/.github/workflows/tag-release.yaml b/.github/workflows/tag-release.yaml
@@ -51,7 +51,7 @@ jobs:
       - name: Rust Cache
         uses: swatinem/rust-cache@v2
         with:
-          workspaces: "./tauri/src-tauri -> target"
+          workspaces: "./tauri/src-tauri"
 
       - name: Set up Nodejs
         uses: actions/setup-node@v4
@@ -69,6 +69,18 @@ jobs:
         id: get_release_version
         run: echo "TAG=${GITHUB_REF#refs/tags/}" >>  $GITHUB_ENV
 
+      - name: get release id
+        id: get_release_id
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const release = await github.rest.repos.getReleaseByTag({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              tag: process.env.TAG
+            });
+            echo "RELEASE_ID=${release.data.id}" >> $GITHUB_ENV
+
       - name: Build the app
         uses: tauri-apps/tauri-action@v0
         env:
@@ -83,15 +95,6 @@ jobs:
           APPLE_ID: ${{ secrets.APPLE_ID }}
           APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
         with:
-          releaseId: ${process.env.TAG}
-
-      - name: publish release
-        id: publish-release
-        uses: actions/github-script@v7
-        with:
-          script: |
-            github.rest.repos.updateRelease({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              release_id: process.env.TAG,
-            })
+          releaseId: ${process.env.RELEASE_ID}
+          args: --target universal-apple-darwin
+          projectPath: ./tauri
diff --git a/tauri/src-tauri/src/compose.rs b/tauri/src-tauri/src/compose.rs
@@ -7,10 +7,12 @@ pub fn start_docker_containers() -> Result<(), String> {
     let home_dir = dirs::home_dir().ok_or("Could not find the home directory.")?;
     let rubra_dir = home_dir.join(".rubra");
 
-    let mut version = env!("CARGO_PKG_VERSION");
-    if version == "0.0.0" {
-        version = "main"
-    }
+    let cargo_version = env!("CARGO_PKG_VERSION");
+    let version = if cargo_version == "0.0.0" {
+        "main".to_string()
+    } else {
+        format!("v{}", cargo_version)
+    };
 
     let status = Command::new("docker-compose")
         .args(["pull"])