Test Docker Desktop installation

.github/workflows/pr-core-tests.yml

@@ -8,17 +8,13 @@ jobs:
     runs-on: ${{ matrix.os }}
     env:
       TERM: xterm
-      GITHUB_PAT: ${{ secrets.PIROG_TOKEN }}
-      GITHUB_KEY_NAME: "${{ github.sha }}${{ matrix.docker-compose-version }}"
     strategy:
       fail-fast: false
       matrix:
-        docker-compose-version:
-          - "2.24.5"
-        healthcheck:
-          - new
         lando-version:
-          - 3-dev-slim
+          - 3-slim
+          # uncomment to test against bleeding edge cli
+          # - 3-dev-slim
         leia-test:
           - examples/badname
           - examples/base
@@ -39,9 +35,14 @@ jobs:
         node-version:
           - "18"
         os:
+          # - macos-13
+          # - macos-14
           - ubuntu-22.04
-        scanner:
-          - new
+          # - windows-2022
+        shell:
+          - bash
+
+        # TODO: includes for also running windows tests on cmd/powershell?
 
     steps:
       - name: Checkout code
@@ -71,20 +72,19 @@ jobs:
         uses: lando/setup-lando@v2
         with:
           lando-version: ${{ matrix.lando-version }}
+          dependency-check: false
           telemetry: false
           config: |
             setup.skipCommonPlugins=true
-            setup.plugins.@lando/core=/home/runner/work/core/core
-            setup.orchestrator=${{ matrix.docker-compose-version }}
-            orchestratorVersion=${{ matrix.docker-compose-version }}
+            setup.plugins.@lando/core=${{ github.workspace }}
       - name: Run Leia Tests
         uses: lando/run-leia-action@v2
         env:
-          LANDO_SCANNER: ${{ matrix.scanner }}
-          LANDO_HEALTHCHECK: ${{ matrix.healthcheck }}
           GH_PCKG_KEY: ${{ secrets.GH_PCKG_KEY }}
+          GITHUB_PAT: ${{ secrets.PIROG_TOKEN }}
+          GITHUB_KEY_NAME: "${{ github.sha }}${{ matrix.os }}"
         with:
           leia-test: "./${{ matrix.leia-test }}/README.md"
           cleanup-header: "Destroy tests"
-          shell: bash
+          shell: ${{ matrix.shell }}
           stdin: true

.github/workflows/pr-linter.yml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         os:
-          - ubuntu-20.04
+          - ubuntu-22.04
         node-version:
           - "18"
     steps:

.github/workflows/pr-plugin-tests.yml

@@ -8,17 +8,13 @@ jobs:
     runs-on: ${{ matrix.os }}
     env:
       TERM: xterm
-      GITHUB_PAT: ${{ secrets.PIROG_TOKEN }}
-      GITHUB_KEY_NAME: "${{ github.sha }}${{ matrix.docker-compose-version }}"
     strategy:
       fail-fast: false
       matrix:
-        docker-compose-version:
-          - "2.24.5"
-        healthcheck:
-          - new
         lando-version:
-          - 3-dev-slim
+          - 3-slim
+          # uncomment to test against bleeding edge cli
+          # - 3-dev-slim
         leia-test:
           - examples/healthcheck
           - examples/networking
@@ -27,26 +23,15 @@ jobs:
         node-version:
           - "18"
         os:
+          # - macos-13
+          # - macos-14
           - ubuntu-22.04
-        scanner:
-          - new
-        include:
-          # run legacy scanner checks on dc2
-          - docker-compose-version: "2.21.0"
-            healthcheck: new
-            node-version: "18"
-            lando-version: 3-dev
-            leia-test: examples/scanner
-            os: ubuntu-22.04
-            scanner: legacy
-          # run legacy healthchecks on dc2
-          - docker-compose-version: "2.21.0"
-            healthcheck: legacy
-            node-version: "18"
-            lando-version: 3-dev
-            leia-test: examples/healthcheck
-            os: ubuntu-22.04
-            scanner: new
+          # - windows-2022
+        shell:
+          - bash
+
+        # TODO: includes for also running windows tests on cmd/powershell?
+
 
     steps:
       - name: Checkout code
@@ -70,19 +55,15 @@ jobs:
         uses: lando/setup-lando@v2
         with:
           lando-version: ${{ matrix.lando-version }}
+          dependency-check: false
           telemetry: false
           config: |
             setup.skipCommonPlugins=true
-            setup.plugins.@lando/core=/home/runner/work/core/core
-            setup.orchestrator=${{ matrix.docker-compose-version }}
-            orchestratorVersion=${{ matrix.docker-compose-version }}
+            setup.plugins.@lando/core=${{ github.workspace }}
       - name: Run Leia Tests
         uses: lando/run-leia-action@v2
-        env:
-          LANDO_SCANNER: ${{ matrix.scanner }}
-          LANDO_HEALTHCHECK: ${{ matrix.healthcheck }}
         with:
           leia-test: "./${{ matrix.leia-test }}/README.md"
           cleanup-header: "Destroy tests"
-          shell: bash
+          shell: ${{ matrix.shell }}
           stdin: true

.github/workflows/pr-setup-tests.yml → .github/workflows/pr-setup-linux-tests.yml

@@ -1,4 +1,4 @@
-name: Setup Tests
+name: Setup Linux Tests
 
 on:
   pull_request:
@@ -8,35 +8,23 @@ jobs:
     runs-on: ${{ matrix.os }}
     env:
       TERM: xterm
-      GITHUB_PAT: ${{ secrets.PIROG_TOKEN }}
-      GITHUB_KEY_NAME: "${{ github.sha }}${{ matrix.docker-compose-version }}"
     strategy:
       fail-fast: false
       matrix:
-        docker-compose-version:
-          - "2.24.5"
-        healthcheck:
-          - new
         lando-version:
-          - 3-dev-slim
+          - 3-slim
+          # uncomment to test against bleeding edge cli
+          # - 3-dev-slim
         leia-test:
-          - examples/setup
+          - examples/setup-linux
         node-version:
           - "18"
         os:
           - ubuntu-22.04
-        scanner:
-          - new
 
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
-      - name: Install SSH key
-        uses: shimataro/ssh-key-action@v2
-        with:
-          key: ${{ secrets.DEPLOY_KEY }}
-          known_hosts: unnecessary
-          if_key_exists: replace
       - name: Install node ${{ matrix.node-version }}
         uses: actions/setup-node@v3
         with:
@@ -56,14 +44,13 @@ jobs:
         uses: lando/setup-lando@v2
         with:
           lando-version: ${{ matrix.lando-version }}
+          dependency-check: false
+          setup: false
           telemetry: false
-          setup: off
       - name: Run Leia Tests
         uses: lando/run-leia-action@v2
         env:
-          LANDO_SCANNER: ${{ matrix.scanner }}
-          LANDO_HEALTHCHECK: ${{ matrix.healthcheck }}
-          GH_PCKG_KEY: ${{ secrets.GH_PCKG_KEY }}
+          CORE_PLUGIN_PATH: ${{ github.workspace }}
         with:
           leia-test: "./${{ matrix.leia-test }}/README.md"
           cleanup-header: "Destroy tests"

.github/workflows/pr-setup-macos-tests.yml

@@ -0,0 +1,59 @@
+name: Setup macOS Tests
+
+on:
+  pull_request:
+
+jobs:
+  leia-tests:
+    runs-on: ${{ matrix.os }}
+    env:
+      TERM: xterm
+    strategy:
+      fail-fast: false
+      matrix:
+        lando-version:
+          - 3-slim
+          # uncomment to test against bleeding edge cli
+          # - 3-dev-slim
+        leia-test:
+          - examples/setup-macos
+        node-version:
+          - "18"
+        os:
+          - macos-13
+          - macos-14
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Install node ${{ matrix.node-version }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+          registry-url: https://registry.npmjs.org
+          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:
+          lando-plugin: true
+          version: dev
+          sync: false
+      - name: Setup lando ${{ matrix.lando-version }}
+        uses: lando/setup-lando@v2
+        with:
+          lando-version: ${{ matrix.lando-version }}
+          dependency-check: false
+          setup: false
+          telemetry: false
+      - 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: bash
+          stdin: true

.github/workflows/pr-setup-windows-tests.yml

@@ -0,0 +1,100 @@
+name: Setup Windows Tests
+
+on:
+  pull_request:
+
+jobs:
+  leia-tests:
+    runs-on: ${{ matrix.os }}
+    env:
+      TERM: xterm
+    strategy:
+      fail-fast: false
+      matrix:
+        lando-version:
+          - 3-slim
+          # uncomment to test against bleeding edge cli
+          # - 3-dev-slim
+        leia-test:
+          - examples/setup-windows
+        node-version:
+          - "18"
+        os:
+          - windows-2022
+        shell:
+          - bash
+          - cmd
+          - powershell
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Install node ${{ matrix.node-version }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+          registry-url: https://registry.npmjs.org
+          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:
+          lando-plugin: true
+          version: dev
+          sync: false
+      - name: Setup lando ${{ matrix.lando-version }}
+        uses: lando/setup-lando@v2
+        with:
+          lando-version: ${{ matrix.lando-version }}
+          dependency-check: false
+          setup: false
+          telemetry: false
+      # we need to do this to avoid having multiple examples due to different shell considerations
+      - name: Prep for multishell
+        shell: powershell
+        run: |
+          Stop-Service -Name docker -Force
+          Remove-Item -Path (Get-Command docker).Source -Force
+          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

.github/workflows/pr-unit-tests.yml

@@ -10,9 +10,10 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - windows-2022
+          - macos-13
+          - macos-14
           - ubuntu-22.04
-          - macos-12
+          - windows-2022
         node-version:
           - "18"
     steps:

.github/workflows/release.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         os:
-          - ubuntu-20.04
+          - ubuntu-22.04
         node-version:
           - "18"