Skip to content

Commit

Permalink
#2: first pass on support for lando setup part 2
Browse files Browse the repository at this point in the history
  • Loading branch information
pirog committed Nov 6, 2023
1 parent a10b862 commit 68d3a04
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pr-config-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- true
- false
node-version:
- '16'
- '18'

steps:
- name: Checkout code
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-dep-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
os:
- ubuntu-22.04
node-version:
- '16'
- '18'
dependency-check:
- error
- warn
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-file-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
os:
- ubuntu-22.04
node-version:
- '16'
- '18'
lando-version-file:
- '.lando-version'
- '.tool-versions'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
os:
- ubuntu-22.04
node-version:
- '16'
- '18'
steps:
# Install deps and cache
- name: Checkout code
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-os-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- ubuntu-22.04
- windows-2022
node-version:
- '16'
- '18'

steps:
- name: Checkout code
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- ubuntu-22.04
# - windows-2022
node-version:
- '16'
- '18'

steps:
- name: Checkout code
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-versions-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
os:
- ubuntu-22.04
node-version:
- '16'
- '18'
lando-version:
- '3.x'
- '>2'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
os:
- ubuntu-22.04
node-version:
- '16'
- '18'

steps:
- name: Checkout code
Expand Down
5 changes: 1 addition & 4 deletions setup-lando.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,6 @@ const main = async () => {
// start by getting the inputs and stuff
const inputs = getInputs();

inputs.landoVersion = '3-dev';
inputs.setup = 'auto';

// show a warning if both version inputs are set
if (inputs.landoVersion && inputs.landoVersionFile) {
core.warning('Both lando-version and lando-version-file inputs are specified, only lando-version will be used');
Expand All @@ -49,7 +46,7 @@ const main = async () => {
// @NOTE: we use core.exportVariable because we want any GHA workflow that uses @lando/setup-lando to not need
// to handle their own downstream lando debugging. Of course they can if they want since they migth want something
// more targeted or wide than LANDO_DEBUG=1 eg LANDO_DEBUG="*" or LANDO_DEBUG="lando/core*"
// if (core.isDebug() || inputs.debug) core.exportVariable('LANDO_DEBUG', 1);
if (core.isDebug() || inputs.debug) core.exportVariable('LANDO_DEBUG', 1);

// determine lando version spec to install
const spec = inputs.landoVersion || getFileVersion(inputs.landoVersionFile) || 'stable';
Expand Down

0 comments on commit 68d3a04

Please sign in to comment.