WSL: store first install bugfix

aformatik · Oct 22, 2024 · 21228bf · 21228bf
1 parent 817005b
commit 21228bf
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 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:-0}'
     - name: Insert version ${{ github.ref_name }} / ${{ steps.winver.outputs.replaced }}
       env:
         VERSION: ${{ github.ref_name }}

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 0.25
+        done
 
         if ! command -v git &> /dev/null; then
           mkdir -p "${consts.store.DIR_CONFIG_STORE}"