Merge branch 'main' into illegal-op-dir

lando · Jul 25, 2024 · f822b05 · f822b05
2 parents 181d1df + 3a00861
commit f822b05
Show file tree

Hide file tree

Showing 332 changed files with 6,718 additions and 2,037 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -9,3 +9,5 @@
 *.ini text eol=lf
 *.php text eol=lf
 *.vcl text eol=lf
+lash text eol=lf
+landorc text eol=lf
diff --git a/.github/workflows/build-util-images.yml b/.github/workflows/build-util-images.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   buildx:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     env:
       TERM: xterm
     strategy:

diff --git a/.github/workflows/pr-core-tests.yml b/.github/workflows/pr-core-tests.yml
@@ -12,33 +12,57 @@ jobs:
       fail-fast: false
       matrix:
         lando-version:
-          - 3-slim
+          # - 3-slim
           # uncomment to test against bleeding edge cli
-          # - 3-dev-slim
+          - 3-dev-slim
         leia-test:
-          - examples/badname
-          - examples/base
-          - examples/events
-          - examples/experimental
-          - examples/init-github
-          - examples/init-remote
-          - examples/keys
-          - examples/l337
-          - examples/lando-v4
-          - examples/landofile-custom
-          - examples/long-name
-          - examples/no-services
-          - examples/orchestrator
-          - examples/plugin-commands
-          - examples/services
-          - examples/sql-helpers
-          - examples/tooling
+          - badname
+          - build
+          - cache
+          - certs
+          - config
+          - debug
+          - envfile
+          # - environment
+          - events
+          - exec
+          - experimental
+          - healthcheck
+          - host
+          # - hostnames
+          - info
+          - init-github
+          - init-remote
+          - keys
+          - l337
+          - lando-v4
+          - landofile
+          - landofile-custom
+          - list
+          - logs
+          - long-name
+          - networking
+          - no-services
+          - orchestrator
+          - plugins
+          - proxy
+          - rebuild
+          - recipes
+          - release-channel
+          - restart
+          - scanner
+          - security
+          - sql-helpers
+          - ssh
+          - tooling
+          - update
+          - version
         node-version:
           - "18"
         os:
           # - macos-13
           # - macos-14
-          - ubuntu-22.04
+          - ubuntu-24.04
           # - windows-2022
         shell:
           - bash
@@ -85,7 +109,7 @@ jobs:
           GITHUB_PAT: ${{ secrets.KYBER_AMPLIFICATION_MATRIX }}
           GITHUB_KEY_NAME: "${{ github.sha }}${{ matrix.os }}"
         with:
-          leia-test: "./${{ matrix.leia-test }}/README.md"
+          leia-test: "./examples/${{ matrix.leia-test }}/README.md"
           cleanup-header: "Destroy tests"
           shell: ${{ matrix.shell }}
           stdin: true
diff --git a/.github/workflows/pr-docs-tests.yml b/.github/workflows/pr-docs-tests.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         os:
-          - ubuntu-22.04
+          - ubuntu-24.04
         node-version:
           - "18"
     steps:

diff --git a/.github/workflows/pr-linter.yml b/.github/workflows/pr-linter.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         os:
-          - ubuntu-22.04
+          - ubuntu-24.04
         node-version:
           - "18"
     steps:

diff --git a/.github/workflows/pr-plugin-tests.yml b/.github/workflows/pr-plugin-tests.yml
diff --git a/.github/workflows/pr-setup-linux-tests.yml b/.github/workflows/pr-setup-linux-tests.yml
@@ -12,15 +12,15 @@ jobs:
       fail-fast: false
       matrix:
         lando-version:
-          - 3-slim
+          # - 3-slim
           # uncomment to test against bleeding edge cli
-          # - 3-dev-slim
+          - 3-dev-slim
         leia-test:
-          - examples/setup-linux
+          - setup-linux
         node-version:
           - "18"
         os:
-          - ubuntu-22.04
+          - ubuntu-24.04
 
     steps:
       - name: Checkout code
@@ -33,7 +33,6 @@ jobs:
           cache: npm
       - name: Install dependencies
         run: npm clean-install --prefer-offline --frozen-lockfile
-      # bundle deps is needed so local plugin installation succeeds
       - name: Bundle Deps
         uses: lando/prepare-release-action@v3
         with:
@@ -49,7 +48,7 @@ jobs:
       - name: Run Leia Tests
         uses: lando/run-leia-action@v2
         with:
-          leia-test: "./${{ matrix.leia-test }}/README.md"
+          leia-test: "./examples/${{ matrix.leia-test }}/README.md"
           cleanup-header: "Destroy tests"
           shell: bash
           stdin: true
diff --git a/.github/workflows/pr-setup-macos-tests.yml b/.github/workflows/pr-setup-macos-tests.yml
@@ -12,11 +12,11 @@ jobs:
       fail-fast: false
       matrix:
         lando-version:
-          - 3-slim
+          # - 3-slim
           # uncomment to test against bleeding edge cli
-          # - 3-dev-slim
+          - 3-dev-slim
         leia-test:
-          - examples/setup-macos
+          - setup-macos
         node-version:
           - "18"
         os:
@@ -34,7 +34,6 @@ jobs:
           cache: npm
       - name: Install dependencies
         run: npm clean-install --prefer-offline --frozen-lockfile
-      # bundle deps is needed so local plugin installation succeeds
       - name: Bundle Deps
         uses: lando/prepare-release-action@v3
         with:
@@ -50,7 +49,7 @@ jobs:
       - name: Run Leia Tests
         uses: lando/run-leia-action@v2
         with:
-          leia-test: "./${{ matrix.leia-test }}/README.md"
+          leia-test: "./examples/${{ matrix.leia-test }}/README.md"
           cleanup-header: "Destroy tests"
           shell: bash
           stdin: true
diff --git a/.github/workflows/pr-setup-windows-tests.yml b/.github/workflows/pr-setup-windows-tests.yml
@@ -12,20 +12,15 @@ jobs:
       fail-fast: false
       matrix:
         lando-version:
-          - 3-slim
+          # - 3-slim
           # uncomment to test against bleeding edge cli
-          # - 3-dev-slim
+          - 3-dev-slim
         leia-test:
-          - examples/setup-windows
+          - setup-windows
         node-version:
           - "18"
         os:
           - windows-2022
-        shell:
-          - bash
-          - cmd
-          - powershell
-
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -37,7 +32,6 @@ jobs:
           cache: npm
       - name: Install dependencies
         run: npm clean-install --prefer-offline --frozen-lockfile
-      # bundle deps is needed so local plugin installation succeeds
       - name: Bundle Deps
         uses: lando/prepare-release-action@v3
         with:
@@ -50,46 +44,11 @@ jobs:
           auto-setup: false
           lando-version: ${{ matrix.lando-version }}
           telemetry: false
-      - name: Dogfood core plugin
-        shell: powershell
-        run: lando plugin-add "@lando/core@file:${{ github.workspace }}"
-
-      # @TODO: we need to reimplement this with leia tests like the other os setup tests but ran out of time
-      # becuse this one is a bit more involved since it tries three different shells
-      - name: Lando Setup - BASH
-        if: matrix.shell == 'bash'
-        shell: bash
-        run: lando setup -y
-      - name: Lando Setup - CMD
-        if: matrix.shell == 'cmd'
-        shell: cmd
-        run: lando setup -y
-      - name: Lando Setup - POWERSHELL
-        if: matrix.shell == 'powershell'
-        shell: powershell
-        run: lando setup -y
-
-      # @TODO: for some reason the below refused to load anything but bash so we are just going to invoke leia
-      # directly for now but eventually we need to find out why this is the case
-      # - name: Run Leia Tests
-      #   uses: lando/run-leia-action@v2
-      #   env:
-      #     CORE_PLUGIN_PATH: ${{ github.workspace }}
-      #   with:
-      #     leia-test: "./${{ matrix.leia-test }}/README.md"
-      #     cleanup-header: "Destroy tests"
-      #     shell: powershell
-      #     stdin: true
-      #     debug: true
-      # - name: Run Leia Tests
-      #   shell: bash
-      #   run: |
-      #     npx leia --version
-      #     npx leia "./${{ matrix.leia-test }}/README.md" \
-      #       --setup-header=Start,Setup,This is the dawning \
-      #       --test-header=Test,Validat,Verif \
-      #       --cleanup-header=Destroy tests \
-      #       --shell=${{ matrix.shell }} \
-      #       --retry=1 \
-      #       --stdin \
-      #       --debug
+      - name: Run Leia Tests
+        uses: lando/run-leia-action@v2
+        with:
+          leia-test: "./examples/${{ matrix.leia-test }}/README.md"
+          cleanup-header: "Destroy tests"
+          shell: powershell
+          stdin: true
+          debug: true
diff --git a/.github/workflows/pr-unit-tests.yml b/.github/workflows/pr-unit-tests.yml
@@ -12,7 +12,7 @@ jobs:
         os:
           - macos-13
           - macos-14
-          - ubuntu-22.04
+          - ubuntu-24.04
           - windows-2022
         node-version:
           - "18"