improve busted version tests

Author: pirog

.github/workflows/pr-posix-script-versions-tests.yml

@@ -19,20 +19,33 @@ jobs:
         fat:
           - --fat
           - ''
-        success-version:
-          - '3'
-          - 'v3.21.0-beta.10'
-          - '3-stable'
-          - '3-edge'
-          - '3-edge'
-          - '3-latest'
-          - '3-dev'
-          - 'stable'
-          - 'edge'
-          - 'latest'
-          - 'dev'
-          - 'bin/lando'
-          - 'set-with-envvar'
+        include:
+          - version: '3'
+            check: 'v3.'
+          - version: 'v3.21.0-beta.10'
+            check: 'v3.21.0-beta.10'
+          - version: '3-stable'
+            check: 'v3.'
+          - version: '3-edge'
+            check: 'v3.'
+          - version: '3-edge'
+            check: 'v3.'
+          - version: '3-latest'
+            check: 'v3.'
+          - version: '3-dev'
+            check: 'v3\..*\..*-.*-.*'
+          - version: 'stable'
+            check: 'v3.'
+          - version: 'edge'
+            check: 'v3.'
+          - version: 'latest'
+            check: 'v3.'
+          - version: 'dev'
+            check: 'v3.'
+          - version: 'bin/lando'
+            check: 'v3.100.999-babylon.5'
+          - version: 'set-with-envvar'
+            check: 'v3.22.0'
 
     steps:
       - name: Checkout code
@@ -44,13 +57,13 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
           cache: npm
-      - name: Setup Lando version ${{ matrix.success-version }}
+      - name: Setup Lando version ${{ matrix.version }}
         shell: bash
         run: |
-          if [[ "${{ matrix.success-version }}" == "set-with-envvar" ]]; then
+          if [[ "${{ matrix.version }}" == "set-with-envvar" ]]; then
             LANDO_VERSION=v3.22.0 ./setup-lando.sh --no-setup ${{ matrix.fat }}
           else
-            ./setup-lando.sh --version=${{ matrix.success-version }} --no-setup ${{ matrix.fat }}
+            ./setup-lando.sh --version=${{ matrix.version }} --no-setup ${{ matrix.fat }}
           fi
 
-          lando version --all
+          lando version | grep -E '${{ matrix.check }}'

.github/workflows/pr-windows-script-replacer-tests.yml

@@ -54,7 +54,7 @@ jobs:
             throw "Error: lando is not where we expect it!"
           }
 
-          if (-not (lando version | Select-String -Pattern "${{ matrix.old-version }}" -SimpleMatch)) {
+          if (-not (lando version | Select-String -Pattern "${{ matrix.old-version }}")) {
             throw "Error: lando is not the version we expect!"
           }
 
@@ -68,10 +68,7 @@ jobs:
             throw "Error: lando is not where we expect it!"
           }
 
-          lando version
-          Get-ChildItem -Path "$env:USERPROFILE\.lando\plugins\@lando"
-
-
-          if (-not (lando version | Select-String -Pattern "${{ matrix.version }}" -SimpleMatch)) {
-            throw "Error: lando is not the version we expect!"
+          if (-not (lando version | Select-String -Pattern "${{ matrix.version }}")) {
+            $reported = & "lando version"
+            throw "Error: lando is not the version we expect! expected ${{ matrix.version}} but found $reported"
           }

.github/workflows/pr-windows-script-versions-tests.yml

@@ -15,45 +15,47 @@ jobs:
         fat:
           - -Fat
           - ''
-        success-version:
-          - '3'
-          - 'v3.21.0-beta.10'
-          - '3-stable'
-          - '3-edge'
-          - '3-edge'
-          - '3-latest'
-          - '3-dev'
-          - 'stable'
-          - 'edge'
-          - 'latest'
-          - 'dev'
-          - 'skip'
+        include:
+          - version: '3'
+            check: 'v3.*.*'
+          - version: 'v3.21.0-beta.10'
+            check: 'v3.21.0-beta.10'
+          - version: '3-stable'
+            check: 'v3.*.*'
+          - version: '3-edge'
+            check: 'v3.*.*'
+          - version: '3-latest'
+            check: 'v3.*.*'
+          - version: '3-dev'
+            check: 'v3.*.*'
+          - version: 'stable'
+            check: 'v3.*.*'
+          - version: 'edge'
+            check: 'v3.*.*'
+          - version: 'latest'
+            check: 'v3.*.*'
+          - version: 'dev'
+            check: 'v3.*.*-*-*'
+          - version: 'set-with-envvar'
+            check: 'v3.22.0'
 
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Setup Lando version ${{ matrix.success-version }} ${{ matrix.fat }}
+      - name: Setup Lando version ${{ matrix.version }} ${{ matrix.fat }}
         shell: powershell # 5.1
         run: |
           # skip command
-          if ("${{ matrix.success-version }}" -eq "skip") {
+          if ("${{ matrix.version }}" -eq "set-with-envvar") {
             $env:LANDO_VERSION = "v3.22.0"
             .\setup-lando.ps1 -NoSetup ${{ matrix.fat }} -Debug
           } else {
-            .\setup-lando.ps1 -Version=${{ matrix.success-version }} -NoSetup ${{ matrix.fat }} -Debug
+            .\setup-lando.ps1 -Version=${{ matrix.version }} -NoSetup ${{ matrix.fat }} -Debug
           }
 
-          lando version --all
-
-          # test slim|fat on lando 3
-          if (lando version | Select-String "v3.") {
-            if (${{ matrix.fat }} -eq "-Fat") {
-              lando config --path cli.slim | Select-String "false"
-            }
-            else {
-              lando config --path cli.slim | Select-String "true"
-            }
+          if (-not (lando version | Select-String -Pattern "${{ matrix.check }}")) {
+            $reported = & "lando version"
+            throw "Error: lando is not the version we expect! expected ${{ matrix.version}} but found $reported"
           }
-

CHANGELOG.md

@@ -1,6 +1,7 @@
 ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
 
 * Added `path` based installation to POSIX `setup-lando.sh` script
+* Added GitHub Actions `RUNNER_DEBUG` support to PowerShell script
 * Fixed bug preventing POSIX/Windows script from replacing existing `lando` installations
 
 ## v3.4.5 - [November 10, 2024](https://github.com/lando/setup-lando/releases/tag/v3.4.5)

setup-lando.ps1

@@ -66,6 +66,9 @@ Set-StrictMode -Version 1
 # We'll still need to check exit codes on any exe we run.
 $ErrorActionPreference = "Stop"
 
+# Allow github actions to set $Debug
+if ($env:RUNNER_DEBUG -ne $null -and $env:RUNNER_DEBUG -ne "") {$Debug = $true}
+
 # Normalize debug preference
 $DebugPreference = If ($Debug) { "Continue" } Else { $DebugPreference }
 if ($DebugPreference -eq "Inquire" -or $DebugPreference -eq "Continue") {
@@ -74,9 +77,6 @@ if ($DebugPreference -eq "Inquire" -or $DebugPreference -eq "Continue") {
 $Host.PrivateData.DebugForegroundColor = "Gray"
 $Host.PrivateData.DebugBackgroundColor = $Host.UI.RawUI.BackgroundColor
 
-# Allow github actions to set $Debug
-if ($env:RUNNER_DEBUG) {$Debug = $true}
-
 # Encoding must be Unicode to support parsing wsl.exe output
 [Console]::OutputEncoding = [System.Text.Encoding]::Unicode