fixed some packaging problems with new combined cli/core

.github/workflows/dev-release-cli.yml

@@ -37,7 +37,7 @@ jobs:
       - name: Install dependencies
         run: npm clean-install --prefer-offline --frozen-lockfile --production
       - name: Install fatcore
-        run: scripts/fatcore-install.sh --edge
+        run: scripts/fatcore-install.sh
       - name: Prepare Release
         uses: lando/prepare-release-action@v3
         with:

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

@@ -11,12 +11,6 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        lando-version:
-          # - 3-slim
-          # uncomment to test against edge cli
-          - 3-edge-slim
-          # uncomment to test against dev cli
-          # - 3-dev-slim
         leia-test:
           - badname
           - build
@@ -107,14 +101,11 @@ jobs:
           upload: false
           pkg: "@yao-pkg/[email protected]"
       - name: Install full deps
-        run: |
-          npm clean-install --prefer-offline --frozen-lockfile
-          echo "${{ steps.pkg-action.outputs.file }}"
-      - name: Setup lando ${{ matrix.lando-version }}
+        run: npm clean-install --prefer-offline --frozen-lockfile
+      - name: Setup lando ${{ steps.pkg-action.outputs.file }}
         uses: lando/setup-lando@v3
         with:
           lando-version: ${{ steps.pkg-action.outputs.file }}
-          auto-setup: lando plugin-add @lando/core@file:${{ github.workspace }} && lando setup
           telemetry: false
           config: |
             setup.skipCommonPlugins=true

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

@@ -46,12 +46,6 @@ jobs:
       DEBUG: "@lando/*"
     strategy:
       matrix:
-        lando-version:
-          # - 3-slim
-          # uncomment to test against edge cli
-          - 3-edge-slim
-          # uncomment to test against dev cli
-          # - 3-dev-slim
         os:
           - ubuntu-24.04
         node-version:
@@ -64,21 +58,29 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
           cache: npm
-      - name: Install dependencies
-        run: npm clean-install --prefer-offline --frozen-lockfile
       - name: Bundle Deps
         uses: lando/prepare-release-action@v3
         with:
           lando-plugin: true
           version: dev
           sync: false
-      # note that we need a custom auto-setup command because dogfooding core can impact the
-      # subsequent lando setup
-      - name: Setup lando ${{ matrix.lando-version }}
+      - name: Install pkg dependencies
+        run: npm clean-install --prefer-offline --frozen-lockfile --production
+      - name: Package into node binary
+        uses: lando/pkg-action@v5
+        id: pkg-action
+        with:
+          entrypoint: bin/lando
+          node-version: ${{ matrix.node-version }}
+          options: --options dns-result-order=ipv4first
+          upload: false
+          pkg: "@yao-pkg/[email protected]"
+      - name: Install full deps
+        run: npm clean-install --prefer-offline --frozen-lockfile
+      - name: Setup lando ${{ steps.pkg-action.outputs.file }}
         uses: lando/setup-lando@v3
         with:
-          auto-setup: lando plugin-add @lando/core@file:${{ github.workspace }} && lando setup
-          lando-version: ${{ matrix.lando-version }}
+          lando-version: ${{ steps.pkg-action.outputs.file }}
           telemetry: false
           config: |
             setup.skipCommonPlugins=true

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

@@ -11,12 +11,6 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        lando-version:
-          # - 3-slim
-          # uncomment to test against edge cli
-          - 3-edge-slim
-          # uncomment to test against dev cli
-          # - 3-dev-slim
         leia-test:
           - setup-linux
         node-version:
@@ -33,19 +27,30 @@ jobs:
           node-version: ${{ matrix.node-version }}
           registry-url: https://registry.npmjs.org
           cache: npm
-      - name: Install dependencies
-        run: npm clean-install --prefer-offline --frozen-lockfile
       - name: Bundle Deps
         uses: lando/prepare-release-action@v3
         with:
           lando-plugin: true
           version: dev
           sync: false
-      - name: Setup lando ${{ matrix.lando-version }}
+      - name: Install pkg dependencies
+        run: npm clean-install --prefer-offline --frozen-lockfile --production
+      - name: Package into node binary
+        uses: lando/pkg-action@v5
+        id: pkg-action
+        with:
+          entrypoint: bin/lando
+          node-version: ${{ matrix.node-version }}
+          options: --options dns-result-order=ipv4first
+          upload: false
+          pkg: "@yao-pkg/[email protected]"
+      - name: Install full deps
+        run: npm clean-install --prefer-offline --frozen-lockfile
+      - name: Setup lando ${{ steps.pkg-action.outputs.file }}
         uses: lando/setup-lando@v3
         with:
           auto-setup: false
-          lando-version: ${{ matrix.lando-version }}
+          lando-version: ${{ steps.pkg-action.outputs.file }}
           telemetry: false
       - name: Run Leia Tests
         uses: lando/run-leia-action@v2

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

@@ -11,12 +11,6 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        lando-version:
-          # - 3-slim
-          # uncomment to test against edge cli
-          - 3-edge-slim
-          # uncomment to test against dev cli
-          # - 3-dev-slim
         leia-test:
           - setup-macos
         node-version:
@@ -34,19 +28,30 @@ jobs:
           node-version: ${{ matrix.node-version }}
           registry-url: https://registry.npmjs.org
           cache: npm
-      - name: Install dependencies
-        run: npm clean-install --prefer-offline --frozen-lockfile
       - name: Bundle Deps
         uses: lando/prepare-release-action@v3
         with:
           lando-plugin: true
           version: dev
           sync: false
-      - name: Setup lando ${{ matrix.lando-version }}
+      - name: Install pkg dependencies
+        run: npm clean-install --prefer-offline --frozen-lockfile --production
+      - name: Package into node binary
+        uses: lando/pkg-action@v5
+        id: pkg-action
+        with:
+          entrypoint: bin/lando
+          node-version: ${{ matrix.node-version }}
+          options: --options dns-result-order=ipv4first
+          upload: false
+          pkg: "@yao-pkg/[email protected]"
+      - name: Install full deps
+        run: npm clean-install --prefer-offline --frozen-lockfile
+      - name: Setup lando ${{ steps.pkg-action.outputs.file }}
         uses: lando/setup-lando@v3
         with:
           auto-setup: false
-          lando-version: ${{ matrix.lando-version }}
+          lando-version: ${{ steps.pkg-action.outputs.file }}
           telemetry: false
       - name: Run Leia Tests
         uses: lando/run-leia-action@v2

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

@@ -11,12 +11,6 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        lando-version:
-          # - 3-slim
-          # uncomment to test against edge cli
-          - 3-edge-slim
-          # uncomment to test against dev cli
-          # - 3-dev-slim
         leia-test:
           - setup-windows
         node-version:
@@ -32,19 +26,30 @@ jobs:
           node-version: ${{ matrix.node-version }}
           registry-url: https://registry.npmjs.org
           cache: npm
-      - name: Install dependencies
-        run: npm clean-install --prefer-offline --frozen-lockfile
       - name: Bundle Deps
         uses: lando/prepare-release-action@v3
         with:
           lando-plugin: true
           version: dev
           sync: false
-      - name: Setup lando ${{ matrix.lando-version }}
+      - name: Install pkg dependencies
+        run: npm clean-install --prefer-offline --frozen-lockfile --production
+      - name: Package into node binary
+        uses: lando/pkg-action@v5
+        id: pkg-action
+        with:
+          entrypoint: bin/lando
+          node-version: ${{ matrix.node-version }}
+          options: --options dns-result-order=ipv4first
+          upload: false
+          pkg: "@yao-pkg/[email protected]"
+      - name: Install full deps
+        run: npm clean-install --prefer-offline --frozen-lockfile
+      - name: Setup lando ${{ steps.pkg-action.outputs.file }}
         uses: lando/setup-lando@v3
         with:
           auto-setup: false
-          lando-version: ${{ matrix.lando-version }}
+          lando-version: ${{ steps.pkg-action.outputs.file }}
           telemetry: false
       - name: Run Leia Tests
         uses: lando/run-leia-action@v2

.github/workflows/release.yml

@@ -38,7 +38,7 @@ jobs:
       - name: Install fatcore
         run: |
           if [ "${{ github.event.release.prerelease }}" ==  "true" ]; then
-            ./scripts/fatcore-install.sh --edge
+            ./scripts/fatcore-install.sh
           else
             ./scripts/fatcore-install.sh
           fi

CHANGELOG.md

@@ -1,5 +1,7 @@
 ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
 
+* Fixed some packaging problems with new combining `core/cli` and changed tests run 💯 packaged
+
 ## v3.23.0-beta.5 - [October 24, 2024](https://github.com/lando/core/releases/tag/v3.23.0-beta.5)
 
 ### Fixes

package.json

@@ -57,6 +57,9 @@
       "config.yml",
       "package.json",
       "scripts/**/*",
+      "plugins/*/package.json",
+      "plugins/*/plugin.yml",
+      "plugins/*/scripts/**/*",
       "node_modules/@lando/**/fastcgi_params",
       "node_modules/@lando/**/*.cnf",
       "node_modules/@lando/**/*.conf",