From 504ff3ffca4670dec6c2c39e11891afbbfae4617 Mon Sep 17 00:00:00 2001
From: Reactor Scram <ReactorScram@users.noreply.github.com>
Date: Tue, 19 Mar 2024 10:41:37 -0500
Subject: [PATCH] ci(tauri-client): try to enable smoke tests for Ubuntu 22.04
 (#3770)

Closes #3699 if successful

Ref #3972

I don't understand why it started working. There's at least 3
possibilities:
- Some unrelated change in the last few weeks fixed it (Maybe bumping
Tauri to 1.6.1? https://github.com/firezone/firezone/pull/3881)
- It was a bug in the Github CI runner image that they fixed
- It's an awful race condition and adding `tracing::debug!` fixed it

---------

Signed-off-by: Reactor Scram <ReactorScram@users.noreply.github.com>
---
 .github/workflows/_rust.yml                 | 2 +-
 rust/gui-client/src-tauri/src/client/gui.rs | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/_rust.yml b/.github/workflows/_rust.yml
index 973b5e984..4c61bfd6c 100644
--- a/.github/workflows/_rust.yml
+++ b/.github/workflows/_rust.yml
@@ -77,7 +77,7 @@ jobs:
         include:
           - runs-on: ubuntu-20.04
           # Broken on 22.04 <https://github.com/firezone/firezone/issues/3699>
-          #- runs-on: ubuntu-22.04
+          - runs-on: ubuntu-22.04
           - runs-on: windows-2019
           - runs-on: windows-2022
     runs-on: ${{ matrix.runs-on }}
diff --git a/rust/gui-client/src-tauri/src/client/gui.rs b/rust/gui-client/src-tauri/src/client/gui.rs
index bf0f2d75f..ddede987d 100644
--- a/rust/gui-client/src-tauri/src/client/gui.rs
+++ b/rust/gui-client/src-tauri/src/client/gui.rs
@@ -188,6 +188,7 @@ pub(crate) fn run(cli: &client::Cli) -> Result<(), Error> {
         });
     }
 
+    tracing::debug!("Setting up Tauri app instance...");
     let app = tauri::Builder::default()
         .manage(managed)
         .on_window_event(|event| {
@@ -229,6 +230,7 @@ pub(crate) fn run(cli: &client::Cli) -> Result<(), Error> {
             }
         })
         .setup(move |app| {
+            tracing::debug!("Entered Tauri's `setup`");
             assert_eq!(
                 BUNDLE_ID,
                 app.handle().config().tauri.bundle.identifier,
@@ -275,8 +277,9 @@ pub(crate) fn run(cli: &client::Cli) -> Result<(), Error> {
             });
 
             Ok(())
-        })
-        .build(tauri::generate_context!());
+        });
+    tracing::debug!("Building Tauri app...");
+    let app = app.build(tauri::generate_context!());
 
     let app = match app {
         Ok(x) => x,
@@ -782,6 +785,7 @@ async fn run_controller(
     advanced_settings: AdvancedSettings,
     notify_controller: Arc<Notify>,
 ) -> Result<()> {
+    tracing::debug!("Reading / generating device ID...");
     let device_id =
         connlib_shared::device_id::get().context("Failed to read / create device ID")?;