release v3.7.1 generated by @lando/prepare-release-action

CHANGELOG.md

@@ -1,5 +1,7 @@
 ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
 
+## v3.7.1 - [December 7, 2024](https://github.com/lando/setup-lando/releases/tag/v3.7.1)
+
 * Removed `lando setup` and `-slim` functionality for upcoming Lando `>=3.24`
 
 ## v3.7.0 - [December 2, 2024](https://github.com/lando/setup-lando/releases/tag/v3.7.0)

dist/index.js

@@ -44110,25 +44110,6 @@ function wrappy (fn, cb) {
 }
 
 
-/***/ }),
-
-/***/ 112:
-/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
-
-"use strict";
-
-
-const satisfies = __nccwpck_require__(8011);
-const {s3Releases} = __nccwpck_require__(809);
-
-module.exports = version => {
-  // slim can be any v3 s3 alias
-  if (s3Releases.includes(version)) return version.split('-')[0] === '3';
-  // or anything in the range
-  return satisfies(version, '>3.20 <4', {includePrerelease: true, loose: true});
-};
-
-
 /***/ }),
 
 /***/ 8172:
@@ -44489,6 +44470,25 @@ module.exports = data => {
 };
 
 
+/***/ }),
+
+/***/ 6073:
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+const satisfies = __nccwpck_require__(8011);
+const {s3Releases} = __nccwpck_require__(809);
+
+module.exports = version => {
+  // slim can be any v3 s3 alias
+  if (s3Releases.includes(version)) return false;
+  // or anything in the range
+  return satisfies(version, '>3.20 <=3.23.9999', {includePrerelease: true, loose: true});
+};
+
+
 /***/ }),
 
 /***/ 8015:
@@ -46569,7 +46569,7 @@ var __webpack_exports__ = {};
 "use strict";
 
 
-const SCRIPT_VERSION = 'v3.7.0';
+const SCRIPT_VERSION = 'v3.7.1';
 
 const core = __nccwpck_require__(7484);
 const exec = __nccwpck_require__(5236);
@@ -46585,14 +46585,14 @@ const {execSync} = __nccwpck_require__(5317);
 const {GitHub, getOctokitOptions} = __nccwpck_require__(8006);
 const {paginateRest} = __nccwpck_require__(8082);
 
-const canBeSlim = __nccwpck_require__(112);
 const getConfigFile = __nccwpck_require__(8172);
 const getDownloadUrl = __nccwpck_require__(5287);
 const getGCFPath = __nccwpck_require__(3123);
 const getInputs = __nccwpck_require__(3926);
 const getFileVersion = __nccwpck_require__(8568);
 const getObjectKeys = __nccwpck_require__(9773);
 const getSetupCommand = __nccwpck_require__(890);
+const isSlimSetupy = __nccwpck_require__(6073);
 const mergeConfig = __nccwpck_require__(7509);
 const parseSetupCommand = __nccwpck_require__(7013);
 const resolveVersionSpec = __nccwpck_require__(8771);
@@ -46654,8 +46654,8 @@ const main = async () => {
     // throw error if we cannot resolve a version
     if (!version) throw new Error(`Could not resolve "${spec}" into an installable version of Lando`);
 
-    // now that we have a version lets try to reevaluate slim since it should only be true in the >3.21 <4 range
-    if (inputs.slim) inputs.slim = inputs.slim && canBeSlim(version);
+    // now that we have a version lets try to reevaluate slim since it should only be true in the <3.24 range
+    if (inputs.slim) inputs.slim = inputs.slim && isSlimSetupy(version);
 
     // start by assuming that version is just the path to some locally installed version of lando
     let landoPath = version;
@@ -46756,10 +46756,10 @@ const main = async () => {
     }
 
     // if setup is non-false then we want to try to run it if we can
-    if (lmv === 'v3' && getSetupCommand(inputs.setup) !== false) {
+    if (isSlimSetupy(version) && getSetupCommand(inputs.setup) !== false) {
       // print warning if setup command does not exist and leave
       if (await exec.exec(landoPath, ['setup', '--help'], {ignoreReturnCode: true}) !== 0) {
-        core.warning('lando setup is only available in lando >=3.21 <4! Skipping!');
+        core.warning('lando setup is only available in lando <3.24! Skipping!');
 
       // if we get here then we should be G2G
       } else {

dist/setup-lando.js

@@ -16,14 +16,14 @@ const {execSync} = require('child_process');
 const {GitHub, getOctokitOptions} = require('@actions/github/lib/utils');
 const {paginateRest} = require('@octokit/plugin-paginate-rest');
 
-const canBeSlim = require('./utils/can-be-slim');
 const getConfigFile = require('./utils/get-config-file');
 const getDownloadUrl = require('./utils/get-download-url');
 const getGCFPath = require('./utils/get-gcf-path');
 const getInputs = require('./utils/get-inputs');
 const getFileVersion = require('./utils/get-file-version');
 const getObjectKeys = require('./utils/get-object-keys');
 const getSetupCommand = require('./utils/get-setup-command');
+const isSlimSetupy = require('./utils/is-slim-setupy');
 const mergeConfig = require('./utils/merge-config');
 const parseSetupCommand = require('./utils/parse-setup-command');
 const resolveVersionSpec = require('./utils/resolve-version-spec');
@@ -85,8 +85,8 @@ const main = async () => {
     // throw error if we cannot resolve a version
     if (!version) throw new Error(`Could not resolve "${spec}" into an installable version of Lando`);
 
-    // now that we have a version lets try to reevaluate slim since it should only be true in the >3.21 <4 range
-    if (inputs.slim) inputs.slim = inputs.slim && canBeSlim(version);
+    // now that we have a version lets try to reevaluate slim since it should only be true in the <3.24 range
+    if (inputs.slim) inputs.slim = inputs.slim && isSlimSetupy(version);
 
     // start by assuming that version is just the path to some locally installed version of lando
     let landoPath = version;
@@ -187,10 +187,10 @@ const main = async () => {
     }
 
     // if setup is non-false then we want to try to run it if we can
-    if (lmv === 'v3' && getSetupCommand(inputs.setup) !== false) {
+    if (isSlimSetupy(version) && getSetupCommand(inputs.setup) !== false) {
       // print warning if setup command does not exist and leave
       if (await exec.exec(landoPath, ['setup', '--help'], {ignoreReturnCode: true}) !== 0) {
-        core.warning('lando setup is only available in lando >=3.21 <4! Skipping!');
+        core.warning('lando setup is only available in lando <3.24! Skipping!');
 
       // if we get here then we should be G2G
       } else {

dist/setup-lando.ps1

@@ -3,7 +3,7 @@
 Lando Windows Installer Script.
 
 .DESCRIPTION
-This script is used to download and install Lando on Windows. It will also run lando setup on >3.21 <4 but this can
+This script is used to download and install Lando on Windows. It will also run lando setup on <3.24 but this can
 be disabled with -NoSetup.
 
 Environment Variables:
@@ -26,9 +26,9 @@ param(
   # Installs in this directory. Defaults to "$env:USERPROFILE\.lando\bin".
   [ValidateNotNullOrEmpty()]
   [string]$Dest = "$env:USERPROFILE\.lando\bin",
-  # Installs the fat binary. 3.21+ <4 only, NOT RECOMMENDED!
+  # Installs the fat binary. <3.24 only, NOT RECOMMENDED!
   [switch]$Fat = $env:LANDO_INSTALLER_FAT -or $false,
-  # Installs without running lando setup. 3.21+ <4 only.
+  # Installs without running lando setup. <3.24 only.
   [switch]$NoSetup = $env:LANDO_INSTALLER_SETUP -eq 0 -or $false,
   # Installs this version. Defaults to "stable".
   [ValidateNotNullOrEmpty()]
@@ -79,7 +79,7 @@ function Get-SystemArchitecture {
 }
 
 # Config of sorts
-$SCRIPT_VERSION = "v3.7.0"
+$SCRIPT_VERSION = "v3.7.1"
 
 $LANDO_DEFAULT_MV = "3"
 $LANDO_BINDIR = "$env:USERPROFILE\.lando\bin"

dist/setup-lando.sh

@@ -1,4 +1,4 @@
-SCRIPT_VERSION="v3.7.0"
+SCRIPT_VERSION="v3.7.1"
 #!/bin/bash
 set -u
 # Lando POSIX setup script.
@@ -190,8 +190,8 @@ Usage: ${tty_dim}[NONINTERACTIVE=1] [CI=1]${tty_reset} ${tty_bold}setup-lando.sh
 ${tty_green}Options:${tty_reset}
   --arch           installs for this arch ${tty_dim}[default: ${ARCH}]${tty_reset}
   --dest           installs in this directory ${tty_dim}[default: ${DEST}]${tty_reset}
-  --fat            installs fat binary ${tty_dim}3.21+ <4 only, not recommended${tty_reset}
-  --no-setup       installs without running lando setup ${tty_dim}3.21+ <4 only${tty_reset}
+  --fat            installs fat binary ${tty_dim}<3.24 only, not recommended${tty_reset}
+  --no-setup       installs without running lando setup ${tty_dim}<3.24 only${tty_reset}
   --os             installs for this os ${tty_dim}[default: ${OS}]${tty_reset}
   --syslink        installs symlink in /usr/local/bin ${tty_dim}[default: ${SYSLINK}]${tty_reset}
   --version        installs this version ${tty_dim}[default: ${VERSION}]${tty_reset}
@@ -585,16 +585,16 @@ fi
 
 # autoslim all v3 urls by default
 # @TODO: restrict this to 3 < 3.24.0 at some point?
-if [[ $URL != file://* ]] && [[ $LMV == '3' ]] && [[ $FAT != '1' ]]; then
+if [[ $URL != file://* ]] && [[ -z "${VERSION_DEV-}" ]] && [[ $FAT != '1' ]] && version_compare "3.23" "$SVERSION"; then
   URL="${URL}-slim"
   HRV="$VERSION-slim"
   debug "autoslimin url for lando 3 to $URL"
 fi
 
 # force setup to 0 if lando 4
-if [[ $SETUP == '1' ]] && [[ $LMV == '4' ]]; then
+if [[ $SETUP == '1' ]] && version_compare "$SVERSION" "3.23"; then
   SETUP=0
-  debug "disabled autosetup --setup=${SETUP}, not needed in v${LMV}"
+  debug "disabled autosetup --setup=${SETUP}, not needed in <3.24"
 fi
 
 # determine existing dir we need to check

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lando/setup-lando",
   "description": "GitHub Action to setup Lando on GitHub Actions.",
-  "version": "3.7.0",
+  "version": "3.7.1",
   "author": "Mike Pirog @pirog",
   "main": "setup-lando.js",
   "license": "GPL-3.0",