Rework dependency bundles

Author: arixmkii

.github/workflows/prepare-go-wsllinks-release.yml

@@ -6,15 +6,20 @@ on:
       gowsllinks_version:
         description: go-wsllinks version"
         value: ${{ jobs.build.outputs.gowsllinks_version }}
+      bundles_version:
+        description: bundles version"
+        value: ${{ jobs.build.outputs.bundles_version }}
 env:
   GOWSLLINKS_GITURL: https://github.com/arixmkii/go-wsllinks.git
   GOWSLLINKS_SHA: a2b50fd156e35cea31399ed199f3c297838f02fc # v0.0.6
   GOWSLLINKS_VERSION: 0.0.6
+  BUNDLES_VERSION: 0.0.1
 jobs:
   build:
     runs-on: windows-latest
     outputs:
       gowsllinks_version: ${{ steps.make_versions.outputs.gowsllinks }}
+      bundles_version: ${{ steps.make_versions.outputs.bundles }}
     steps:
       - name: "🏗️ Install msys2"
         uses: msys2/setup-msys2@v2
@@ -38,16 +43,25 @@ jobs:
           git remote add origin $GOWSLLINKS_GITURL
           git fetch --depth 1 origin $GOWSLLINKS_SHA
           git checkout FETCH_HEAD
+          patch --binary -l -p 1 < ../patches/go-wsllinks/0001-Create-Lima-dependency-bundles.patch
       - name: "🛠️ Build go-wsllinks"
         working-directory: go-wsllinks-release
         shell: msys2 {0}
         run: |
           go build -ldflags="-s -w"
+          cp go-wsllinks.exe ./bundle-git
+          cp go-wsllinks.exe ./bundle-wsl
       - name: "📦 Pack go-wsllinks"
         shell: msys2 {0}
         run: |
           mkdir -p qcw
           cp "go-wsllinks-release/go-wsllinks.exe" qcw/
+          mkdir -p qcw-tmp
+          cp -r "go-wsllinks-release/bundle-git" qcw-tmp/bundle-git
+          cp -r "go-wsllinks-release/bundle-wsl" qcw-tmp/bundle-wsl
+          pushd qcw-tmp/
+          zip -9 -r ../qcw/bundles.zip .
+          popd
           cd qcw
           find . -type f \( ! -iname "*.checksums" \) -exec sha256sum -b {} \; > sha.checksums
           find . -type f \( ! -iname "*.checksums" \) -exec sha512sum -b {} \; >> sha.checksums
@@ -57,6 +71,7 @@ jobs:
         shell: msys2 {0}
         run: |
           echo "gowsllinks=$GOWSLLINKS_VERSION" >> "$GITHUB_OUTPUT"
+          echo "bundles=$BUNDLES_VERSION" >> "$GITHUB_OUTPUT"
       - name: "🚀 Upload artifact"
         uses: actions/upload-artifact@v4
         with:

.github/workflows/prepare-lima-release.yml

@@ -9,6 +9,9 @@ on:
       gowsllinks_version:
         description: "go-wsllinks version"
         value: ${{ jobs.build.outputs.gowsllinks_version }}
+      bundles_version:
+        description: "bundles version"
+        value: ${{ jobs.build.outputs.bundles_version }}
       alpine_version:
         description: "Alpine version"
         value: ${{ jobs.build.outputs.alpine_version }}
@@ -30,6 +33,7 @@ jobs:
     outputs:
       lima_version: ${{ steps.make_versions.outputs.lima }}
       gowsllinks_version: ${{ steps.make_versions.outputs.gowsllinks }}
+      bundles_version: ${{ steps.make_versions.outputs.bundles }}
       alpine_version: ${{ steps.make_versions.outputs.alpine }}
       alpine_wsl_version: ${{ steps.make_versions.outputs.alpine_wsl }}
     steps:
@@ -97,8 +101,12 @@ jobs:
         working-directory: lima-release
         shell: msys2 {0}
         run: |
-          cp -f ../qcw-art/qcw-go-wsllinks/go-wsllinks.exe ./contrib/go-wsllinks.exe
-          make binaries add-bundles
+          pushd ../qcw-art/qcw-go-wsllinks/
+          unzip bundles.zip
+          ./bundle-git/install-tools.bat
+          ./bundle-wsl/install-tools.bat
+          popd
+          make binaries
       - name: "🧪 Test Lima WSL2 machine Git shell WSL2 (NAT)"
         working-directory: lima-release
         shell: msys2 {0}
@@ -138,7 +146,7 @@ jobs:
           export LIMACTL_CREATE_ARGS='--vm-type=wsl2 --mount-type=wsl2 --containerd=system'
           export HOME_HOST=$(cygpath $USERPROFILE)
           export HOME_GUEST=$(wsl -d lima-infra wslpath $(cygpath -m $USERPROFILE))
-          _LIMA_WINDOWS_EXTRA_PATH=$PWD/_output/bin/bundle-git ./hack/test-templates.sh templates/experimental/wsl2.yaml
+          _LIMA_WINDOWS_EXTRA_PATH=$PWD/../qcw-art/qcw-go-wsllinks/bundle-git ./hack/test-templates.sh templates/experimental/wsl2.yaml
       - name: "🧪 Test Lima QEMU machine WSL2 bundle WSL2 (NAT)"
         working-directory: lima-release
         shell: msys2 {0}
@@ -151,7 +159,7 @@ jobs:
           export LIMACTL_CREATE_ARGS='--vm-type=qemu'
           export HOME_HOST=$(cygpath $USERPROFILE)
           export HOME_GUEST=$(wsl -d lima-infra wslpath $(cygpath -m $USERPROFILE))
-          _LIMA_WINDOWS_EXTRA_PATH=$PWD/_output/bin/bundle-wsl ./hack/test-templates.sh templates/default.yaml
+          _LIMA_WINDOWS_EXTRA_PATH=$PWD/../qcw-art/qcw-go-wsllinks/bundle-wsl ./hack/test-templates.sh templates/default.yaml
       - name: "🧪 Test Lima WSL2 machine WSL2 bundle WSL2 (NAT)"
         working-directory: lima-release
         shell: msys2 {0}
@@ -164,7 +172,7 @@ jobs:
           export LIMACTL_CREATE_ARGS='--vm-type=wsl2 --mount-type=wsl2 --containerd=system'
           export HOME_HOST=$(cygpath $USERPROFILE)
           export HOME_GUEST=$(wsl -d lima-infra wslpath $(cygpath -m $USERPROFILE))
-          _LIMA_WINDOWS_EXTRA_PATH=$PWD/_output/bin/bundle-wsl ./hack/test-templates.sh templates/experimental/wsl2.yaml
+          _LIMA_WINDOWS_EXTRA_PATH=$PWD/../qcw-art/qcw-go-wsllinks/bundle-wsl ./hack/test-templates.sh templates/experimental/wsl2.yaml
       # - name: "⚙️ Configure WSL2 networking mode mirrored"
       #   shell: msys2 {0}
       #   run: |
@@ -194,12 +202,14 @@ jobs:
         name: "📌 Export versions"
         env:
           GOWSLLINKS_VERSION: ${{ needs.call-prepare-go-wsllinks.outputs.gowsllinks_version }}
+          BUNDLES_VERSION: ${{ needs.call-prepare-go-wsllinks.outputs.bundles_version }}
           ALPINE_VERSION: ${{ needs.call-prepare-alpine-wsl.outputs.alpine_version }}
           ALPINEWSL_VERSION: ${{ needs.call-prepare-alpine-wsl.outputs.alpine_wsl_version }}
         shell: msys2 {0}
         run: |
           echo "lima=$LIMA_VERSION-$LIMA_SHA" >> "$GITHUB_OUTPUT"
           echo "gowsllinks=$GOWSLLINKS_VERSION" >> "$GITHUB_OUTPUT"
+          echo "bundles=$BUNDLES_VERSION" >> "$GITHUB_OUTPUT"
           echo "alpine=$ALPINE_VERSION" >> "$GITHUB_OUTPUT"
           echo "alpine_wsl=$ALPINEWSL_VERSION" >> "$GITHUB_OUTPUT"
       - name: "🚀 Upload artifact"

.github/workflows/publish-qcw-release.yml

@@ -3,18 +3,23 @@ on:
   workflow_dispatch:
     inputs:
       release_name:
-        description: 'Release name'
+        description: 'Release name (noramlly X.Y.Z)'
         required: true
         type: string
       release_tag:
-        description: 'Release tag'
+        description: 'Release tag (normally vX.Y.Z)'
         required: true
         type: string
       release_highlights:
         description: 'Release highlights'
         default: 'TBD.'
         required: true
         type: string
+      dry_run:
+        description: "Skip publishing to releases (dry run)"
+        default: false
+        required: true
+        type: boolean
 jobs:
   call-prepare-docker:
     uses: ./.github/workflows/prepare-docker-release.yml
@@ -45,6 +50,7 @@ jobs:
           DOCKER_VERSION: ${{ needs.call-prepare-docker.outputs.cli_version }}
           DOCKER_COMPOSE_VERSION: ${{ needs.call-prepare-docker.outputs.compose_version }}
           GOWSLLINKS_VERSION: ${{ needs.call-prepare-lima.outputs.gowsllinks_version }}
+          BUNDLES_VERSION: ${{ needs.call-prepare-lima.outputs.bundles_version }}
           LIMA_VERSION: ${{ needs.call-prepare-lima.outputs.lima_version }}
           PODMAN_VERSION: ${{ needs.call-prepare-podman.outputs.podman_version }}
           QEMU_VERSION: ${{ needs.call-prepare-qemu.outputs.qemu_version }}
@@ -64,6 +70,7 @@ jobs:
           sed "s/<<DOCKER_VERSION>>/$DOCKER_VERSION/g" -i release.template.md
           sed "s/<<DOCKER_COMPOSE_VERSION>>/$DOCKER_COMPOSE_VERSION/g" -i release.template.md
           sed "s/<<GOWSLLINKS_VERSION>>/$GOWSLLINKS_VERSION/g" -i release.template.md
+          sed "s/<<BUNDLES_VERSION>>/$BUNDLES_VERSION/g" -i release.template.md
           sed "s/<<LIMA_VERSION>>/$LIMA_VERSION/g" -i release.template.md
           sed "s/<<PODMAN_VERSION>>/$PODMAN_VERSION/g" -i release.template.md
           sed "s/<<QEMU_VERSION>>/$QEMU_VERSION/g" -i release.template.md
@@ -72,6 +79,7 @@ jobs:
           cat qcw/checksums.sha256
           cat qcw/checksums.sha512
       - name: "🏷️ Publish release"
+        if: ${{ !inputs.dry_run }}
         uses: ncipollo/release-action@v1
         with:
           name: ${{ inputs.release_name }}

README.md

@@ -80,10 +80,10 @@ Version `v0.0.6`. Rebuilt for Windows amd64 platform.
 #### `Lima`
 
 Development main branch from revision `88f350be30e395b2f4ca54c48d4ca0760e273a4c` with 6 patch sets:
-* Add Temp placeholder support to templates
-* Improve subsystem path handling in SHELL and USER processing
+* Add Temp placeholder support to templates from https://github.com/lima-vm/lima/pull/3318
+* Improve subsystem path handling in SHELL and USER processing from https://github.com/lima-vm/lima/pull/3304
 * Fix mounts to support Windows
-* Customizadle additional PATH for Windows builds
+* Customizadle additional PATH for Windows builds from https://github.com/lima-vm/lima/pull/3347
 * Support WSL2 as a replacement for msys2/cygwin
 * Enable QEMU support in Lima for Windows
 

patches/go-wsllinks/0001-Create-Lima-dependency-bundles.patch

@@ -0,0 +1,96 @@
+From 9fd60e1d97ce5facbc15d6422bad929ef2fe86f9 Mon Sep 17 00:00:00 2001
+From: Arthur Sengileyev <[email protected]>
+Date: Wed, 12 Mar 2025 20:11:22 +0200
+Subject: [PATCH] Create Lima dependency bundles
+
+---
+ bundle-git/install-tools.bat | 10 ++++++++++
+ bundle-git/sftp-server.ini   |  1 +
+ bundle-git/wsllinks.ini      |  2 ++
+ bundle-wsl/install-tools.bat | 12 ++++++++++++
+ bundle-wsl/sftp-server.ini   |  1 +
+ bundle-wsl/ssh-keygen.ini    |  1 +
+ bundle-wsl/wsllinks.ini      |  2 ++
+ 7 files changed, 29 insertions(+)
+ create mode 100644 bundle-git/install-tools.bat
+ create mode 100644 bundle-git/sftp-server.ini
+ create mode 100644 bundle-git/wsllinks.ini
+ create mode 100644 bundle-wsl/install-tools.bat
+ create mode 100644 bundle-wsl/sftp-server.ini
+ create mode 100644 bundle-wsl/ssh-keygen.ini
+ create mode 100644 bundle-wsl/wsllinks.ini
+
+diff --git a/bundle-git/install-tools.bat b/bundle-git/install-tools.bat
+new file mode 100644
+index 0000000..710ebf6
+--- /dev/null
++++ b/bundle-git/install-tools.bat
+@@ -0,0 +1,10 @@
++@ECHO OFF
++
++copy /Y "%~dp0\go-wsllinks.exe" "%~dp0\bzip2.exe" 1>nul
++copy /Y "%~dp0\go-wsllinks.exe" "%~dp0\cygpath.exe" 1>nul
++copy /Y "%~dp0\go-wsllinks.exe" "%~dp0\gzip.exe" 1>nul
++copy /Y "%~dp0\go-wsllinks.exe" "%~dp0\id.exe" 1>nul
++copy /Y "%~dp0\go-wsllinks.exe" "%~dp0\scp.exe" 1>nul
++copy /Y "%~dp0\go-wsllinks.exe" "%~dp0\sftp-server.exe" 1>nul
++copy /Y "%~dp0\go-wsllinks.exe" "%~dp0\ssh-keygen.exe" 1>nul
++copy /Y "%~dp0\go-wsllinks.exe" "%~dp0\ssh.exe" 1>nul
+diff --git a/bundle-git/sftp-server.ini b/bundle-git/sftp-server.ini
+new file mode 100644
+index 0000000..79cf2da
+--- /dev/null
++++ b/bundle-git/sftp-server.ini
+@@ -0,0 +1 @@
++baseDir = C:\Program Files\Git\usr\lib\ssh
+diff --git a/bundle-git/wsllinks.ini b/bundle-git/wsllinks.ini
+new file mode 100644
+index 0000000..eece20f
+--- /dev/null
++++ b/bundle-git/wsllinks.ini
+@@ -0,0 +1,2 @@
++mode = direct
++baseDir = C:\Program Files\Git\usr\bin
+diff --git a/bundle-wsl/install-tools.bat b/bundle-wsl/install-tools.bat
+new file mode 100644
+index 0000000..351856a
+--- /dev/null
++++ b/bundle-wsl/install-tools.bat
+@@ -0,0 +1,12 @@
++@ECHO OFF
++
++copy /Y "%~dp0\go-wsllinks.exe" "%~dp0\bzip2.exe" 1>nul
++copy /Y "%~dp0\go-wsllinks.exe" "%~dp0\cygpath.exe" 1>nul
++copy /Y "%~dp0\go-wsllinks.exe" "%~dp0\gzip.exe" 1>nul
++copy /Y "%~dp0\go-wsllinks.exe" "%~dp0\id.exe" 1>nul
++copy /Y "%~dp0\go-wsllinks.exe" "%~dp0\scp.exe" 1>nul
++copy /Y "%~dp0\go-wsllinks.exe" "%~dp0\sftp-server.exe" 1>nul
++copy /Y "%~dp0\go-wsllinks.exe" "%~dp0\ssh-keygen.exe" 1>nul
++copy /Y "%~dp0\go-wsllinks.exe" "%~dp0\ssh.exe" 1>nul
++copy /Y "%~dp0\go-wsllinks.exe" "%~dp0\xz.exe" 1>nul
++copy /Y "%~dp0\go-wsllinks.exe" "%~dp0\zstd.exe" 1>nul
+diff --git a/bundle-wsl/sftp-server.ini b/bundle-wsl/sftp-server.ini
+new file mode 100644
+index 0000000..4ad96ac
+--- /dev/null
++++ b/bundle-wsl/sftp-server.ini
+@@ -0,0 +1 @@
++binary = /usr/lib/ssh/sftp-server
+diff --git a/bundle-wsl/ssh-keygen.ini b/bundle-wsl/ssh-keygen.ini
+new file mode 100644
+index 0000000..0e29002
+--- /dev/null
++++ b/bundle-wsl/ssh-keygen.ini
+@@ -0,0 +1 @@
++shellType = standard
+diff --git a/bundle-wsl/wsllinks.ini b/bundle-wsl/wsllinks.ini
+new file mode 100644
+index 0000000..6f27450
+--- /dev/null
++++ b/bundle-wsl/wsllinks.ini
+@@ -0,0 +1,2 @@
++distro = lima-infra
++user = lima
+-- 
+2.48.1
+

patches/lima/0004-Add-additional-PATH-env-var-for-tooling-on-Windows.patch

@@ -1,15 +1,21 @@
-From b05bb1a70b1dcf2c82cf91da4b88bc19ec6693aa Mon Sep 17 00:00:00 2001
+From fc2c5f1474e9b4c7c490ebeed27adcaf9fdc8409 Mon Sep 17 00:00:00 2001
 From: Arthur Sengileyev <[email protected]>
 Date: Sat, 8 Mar 2025 23:29:38 +0200
-Subject: [PATCH 3/4] Add additional PATH env var for tooling on Windows
+Subject: [PATCH] Support setting extra entries for PATH env variable on
+ Windows hosts
+
+During startup `limactl.exe` will check new experimental
+`_LIMA_WINDOWS_EXTRA_PATH` environment variable and when found it
+will be added to PATH environment variable for the running process.
 
 Signed-off-by: Arthur Sengileyev <[email protected]>
 ---
- cmd/limactl/main.go | 10 ++++++++++
- 1 file changed, 10 insertions(+)
+ cmd/limactl/main.go                                  | 10 ++++++++++
+ .../content/en/docs/config/environment-variables.md  | 12 ++++++++++++
+ 2 files changed, 22 insertions(+)
 
 diff --git a/cmd/limactl/main.go b/cmd/limactl/main.go
-index 268fad0d..576489c3 100644
+index 268fad0dcf3..d475f902810 100644
 --- a/cmd/limactl/main.go
 +++ b/cmd/limactl/main.go
 @@ -28,6 +28,16 @@ const (
@@ -22,13 +28,30 @@ index 268fad0d..576489c3 100644
 +			p := os.Getenv("PATH")
 +			err := os.Setenv("PATH", strings.TrimSpace(extras)+string(filepath.ListSeparator)+p)
 +			if err != nil {
-+				logrus.Warning("Can't add extras to PATH, relying fully on system PATH")
++				logrus.Warning("Can't add extras to PATH, relying entirely on system PATH")
 +			}
 +		}
 +	}
  	if err := newApp().Execute(); err != nil {
  		handleExitCoder(err)
  		logrus.Fatal(err)
--- 
-2.48.1
-
+diff --git a/website/content/en/docs/config/environment-variables.md b/website/content/en/docs/config/environment-variables.md
+index b769e95a632..d767e28ada1 100644
+--- a/website/content/en/docs/config/environment-variables.md
++++ b/website/content/en/docs/config/environment-variables.md
+@@ -77,3 +77,15 @@ This page documents the environment variables used in Lima.
+   ```
+ - **Note**: It is expected that this variable will be set to `false` by default in future
+   when QEMU supports `pflash` UEFI for accelerated guests on Windows.
++
++### `_LIMA_WINDOWS_EXTRA_PATH`
++
++- **Description**: Additional directories which will be added to PATH by `limactl.exe` process to search for
++  tools. Is is Windows specific and does nothing for other platforms.
++- **Default**: unset
++- **Usage**:
++  ```bat
++  set _LIMA_WINDOWS_EXTRA_PATH=C:\Program Files\Git\usr\bin
++  ```
++- **Note**: It is an experimental setting and has no guarantees being ever promoted to stable. It may be removed
++  or changed at any stage of project development.