should not need to explicitly call -y in noninteractive situations

lando · Mar 22, 2024 · 1280c4e · 1280c4e
1 parent 38f4109
commit 1280c4e
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/.github/workflows/pr-actions-os-tests.yml b/.github/workflows/pr-actions-os-tests.yml
@@ -36,4 +36,3 @@ jobs:
 
       - name: Setup Lando version
         uses: ./
-
diff --git a/.github/workflows/pr-actions-setup.yml b/.github/workflows/pr-actions-setup.yml
@@ -34,8 +34,8 @@ jobs:
           - off
           - disable
           - disabled
-          - lando setup -y
-          - lando setup --skip-common-plugins --plugin @lando/node --orchestrator 2.21.0 -y
+          - lando setup
+          - lando setup --skip-common-plugins --plugin @lando/node --orchestrator 2.21.0
           # these will fail
           # - lando.dev something
           # - oihywpihgklnw

diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ All inputs are optional. If you do nothing the latest `stable` Lando will be ins
 
 | Name | Description | Default | Example |
 |---|---|---|---|
-| `auto-setup` | The lando setup command to run. | `lando setup -y` | `lando setup --skip-common-plugins --plugin @lando/core@~/path/to/core -y` |
+| `auto-setup` | The lando setup command to run. | `lando setup` | `lando setup --skip-common-plugins --plugin @lando/core@~/path/to/core` |
 | `lando-version` | The version of Lando to install. If set this has primacy over `lando-version-file`. | `stable` | `3.14.0` |
 | `lando-version-file` | A file that contains the version of Lando to install. | `.lando-version` | `.tool-versions` |
 | `config` | A list of `.` delimited config. If set these have primacy over values in `config-file` | `null` | `engineConfig.port=2376` |
@@ -116,7 +116,7 @@ outputs:
   uses: lando/setup-lando@v2
   with:
     lando-version: 3-dev
-    auto-setup: auto | off | disable | lando setup --orchestrator 2.21.0 -y
+    auto-setup: auto | off | disable | lando setup --orchestrator 2.21.0
 ```
 
 **Everything, everywhere, all at once example:**
@@ -126,7 +126,7 @@ outputs:
   uses: lando/setup-lando@v2
   with:
     architecture: x64
-    auto-setup: lando setup --orchestrator 2.22.0 --plugins @pirog/my-plugin -y
+    auto-setup: lando setup --orchestrator 2.22.0 --plugins @pirog/my-plugin
     config: |
       core.engine=docker-colima
       core.telemetry=false

diff --git a/docs/gha.md b/docs/gha.md
@@ -104,7 +104,7 @@ description: Install Lando on GitHub Actions
     os: macOS
     telemetry: false
     token: ${{ github.token }}
-    setup: lando setup --orchestrator 2.22.0 --plugins @pirog/my-plugin -y
+    setup: lando setup --orchestrator 2.22.0 --plugins @pirog/my-plugin
 ```
 
 ## Inputs
@@ -117,7 +117,7 @@ All inputs are optional. If you do nothing the latest `stable` Lando will be ins
 | `lando-version-file` | A file that contains the version of Lando to install. | `.lando-version` | `.tool-versions` |
 | `config` | A list of `.` delimited config. If set these have primacy over values in `config-file` | `null` | `engineConfig.port=2376` |
 | `config-file` | The path to a Lando global config file to use. | `null` | `/config/lando-global.yml` |
-| `setup` | The lando setup command to run. | `lando setup -y` | `lando setup --skip-common-plugins --plugin @lando/core@~/path/to/core -y` |
+| `setup` | The lando setup command to run. | `lando setup` | `lando setup --skip-common-plugins --plugin @lando/core@~/path/to/core -y` |
 
 * Note that `setup` is only available in Lando 3.21+
 

diff --git a/utils/get-setup-command.js b/utils/get-setup-command.js
@@ -18,7 +18,7 @@ module.exports = setup => {
     setup.toUpperCase() === 'RUN' ||
     setup.toUpperCase() === 'TRUE'
     )) {
-    setup = 'lando setup -y';
+    setup = 'lando setup';
   }
 
   // if we get here we *should* have a string command we can parse
Original file line number	Diff line number	Diff line change
Expand Up		@@ -36,4 +36,3 @@ jobs:

		- name: Setup Lando version
		uses: ./