WSL: store first install bugfix

aformatik · Oct 22, 2024 · 37dada9 · 37dada9
1 parent 817005b
commit 37dada9
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 20 deletions.
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -71,8 +71,8 @@ jobs:
       id: winver
       with:
         string: '${{ github.ref_name }}'
-        pattern: '^v(\d+).(\d+).(\d+)-?.*$'
-        replace-with: '$1.$2.$3.0'
+        pattern: '^v(\d+).(\d+).(\d+)(\.(\d+))?$'
+        replace-with: '$1.$2.$3$4'
     - name: Insert version ${{ github.ref_name }} / ${{ steps.winver.outputs.replaced }}
       env:
         VERSION: ${{ github.ref_name }}

diff --git a/codchi/src/platform/machine.rs b/codchi/src/platform/machine.rs
@@ -11,6 +11,7 @@ use crate::{
 };
 use anyhow::{bail, Context, Result};
 use itertools::Itertools;
+use log::Level;
 use std::{collections::HashMap, fs, sync::mpsc::channel, thread};
 
 pub trait MachineDriver: Sized {
@@ -297,20 +298,22 @@ git add flake.*
         if status == PlatformStatus::NotInstalled {
             set_progress_status(format!("Installing {}...", self.config.name));
             self.install().inspect_err(|_err| {
-                log::error!(
-                    "Removing leftovers of machine files for {}...",
-                    self.config.name
-                );
-                log::trace!(
-                    "Deleting config data for {}: {:?}",
-                    self.config.name,
-                    fs::remove_dir_all(host::DIR_CONFIG.join_machine(&self.config.name))
-                );
-                log::trace!(
-                    "Deleting data for {}: {:?}",
-                    self.config.name,
-                    fs::remove_dir_all(host::DIR_DATA.join_machine(&self.config.name))
-                );
+                if !log::log_enabled!(Level::Debug) {
+                    log::error!(
+                        "Removing leftovers of machine files for {}...",
+                        self.config.name
+                    );
+                    log::trace!(
+                        "Deleting config data for {}: {:?}",
+                        self.config.name,
+                        fs::remove_dir_all(host::DIR_CONFIG.join_machine(&self.config.name))
+                    );
+                    log::trace!(
+                        "Deleting data for {}: {:?}",
+                        self.config.name,
+                        fs::remove_dir_all(host::DIR_DATA.join_machine(&self.config.name))
+                    );
+                }
             })?;
         } else {
             if status == PlatformStatus::Stopped {

diff --git a/nix/container/store/default.nix b/nix/container/store/default.nix
@@ -161,10 +161,16 @@ in
         # NIX_DAEMON_PID=$!
         # export NIX_REMOTE="daemon"
 
-        if [ ! -f "${consts.store.DIR_CONFIG_STORE}/flake.nix" ]; then
-          logE "Stores' flake.nix missing!"
-          exit 1
-        fi
+        for i in $(seq 1 10); do 
+          if [ -f "${consts.store.DIR_CONFIG_STORE}/flake.nix" ]; then
+            break
+          elif [ $i -ge 10 ]; then
+            logE "Stores' flake.nix missing!"
+            exit 1
+          fi
+          logE "Stores' flake.nix still missing, waiting a bit..."
+          sleep 1
+        done
 
         if ! command -v git &> /dev/null; then
           mkdir -p "${consts.store.DIR_CONFIG_STORE}"