ci: switched tauri-cli repository to ockam's fork, to be reverted onc…

…e upstream merge the patch
build-trust · Sep 12, 2023 · 02d75e5 · 02d75e5
1 parent 04d4872
commit 02d75e5
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/.github/actions/build_binaries/action.yml b/.github/actions/build_binaries/action.yml
@@ -86,7 +86,7 @@ runs:
       if: inputs.build_app == 'true'
       run: |
         set -x
-        cargo install --locked tauri-cli --version 2.0.0-alpha.10
+        cargo install tauri-cli --git https://github.com/build-trust/tauri.git --branch add-url-scheme
 
         cd implementations/rust/ockam/ockam_app/
         cargo tauri build --target ${{ inputs.target }}
diff --git a/implementations/rust/build.gradle b/implementations/rust/build.gradle
@@ -141,8 +141,17 @@ task build_docs {
   }
 }
 
+task tauri_cli {
+  doLast {
+    exec {
+      environment environmentVars()
+      commandLine cargo('install', 'tauri-cli', '--git', 'https://github.com/build-trust/tauri.git', '--branch', 'add-url-scheme', '--force')
+    }
+  }
+}
+
 task build {
-  dependsOn lint_environment_variables
+  dependsOn lint_environment_variables, tauri_cli
   doLast {
     exec {
       environment environmentVars()

diff --git a/tools/docker/builder/Dockerfile b/tools/docker/builder/Dockerfile
@@ -104,7 +104,7 @@ RUN set -xe; \
     cargo install --locked cargo-deny; \
     cargo install --locked cargo-nextest; \
     cargo install --locked cargo-readme; \
-    cargo install --locked tauri-cli --version 2.0.0-alpha.10; \
+    cargo install tauri-cli --git https://github.com/build-trust/tauri.git --branch add-url-scheme; \
     chmod -R a+w "$RUSTUP_HOME" "$CARGO_HOME"; \
 # Setup erlang
     echo "deb http://deb.debian.org/debian bullseye main" >> /etc/apt/sources.list; \

diff --git a/tools/nix/parts/tauri.nix b/tools/nix/parts/tauri.nix
@@ -15,23 +15,23 @@
         pname = "tauri-cli";
         # NOTE: Bumping version must always be accompanied by updating the two hashes below
         # https://github.com/tauri-apps/tauri/releases
-        version = "2.0.0-alpha.10";
+        version = "2.0.0-alpha.11";
       in
         # Need to make changes?
         # https://nixos.org/manual/nixpkgs/stable/#compiling-rust-applications-with-cargo
         pkgs.rustPlatform.buildRustPackage {
           inherit pname version;
 
           src = pkgs.fetchFromGitHub {
-            owner = "tauri-apps";
+            owner = "build-trust";
             repo = "tauri";
-            rev = "tauri-v${version}";
-            hash = "sha256-WOxl+hgzKmKXQryD5tH7SJ9YvZb9QA4R+YUYnarnhKA=";
+            rev = "7856354fe16197b270dfa36bc095fec33bec4cff";
+            hash = "sha256-UxWT5k3ZTbydy2iW9LXuSLIfQhSafN39g566J0xWDDs=";
           };
           sourceRoot = "source/tooling/cli";
 
           cargoDepsName = pname;
-          cargoHash = "sha256-MQmEOdQWyRbO+hogGQA2xjB9mezq21FClvscs1oWYLE=";
+          cargoHash = "sha256-4OKYj9rPB998JQTLi/k8ICBgYL/jcxXJT/4MAAR6wzU=";
 
           buildInputs =
             [pkgs.openssl]