Dial fully for lando update (#72)

* Dial fully for `lando update` * Update to node 18 * Fix some script-generated issues. * First pass on refactoring and isolating. * Update tests. * Correct init name. * Update tests. * Wait for user at beginning of init build. * add semver. * Update confSrc, remove nginx.
lando · Dec 29, 2023 · 9393c1e · 9393c1e
1 parent 7ff7dbe
commit 9393c1e
Show file tree

Hide file tree

Showing 29 changed files with 9,723 additions and 4,505 deletions.
diff --git a/.github/workflows/pr-docs-tests.yml b/.github/workflows/pr-docs-tests.yml
@@ -11,7 +11,7 @@ jobs:
         os:
           - ubuntu-22.04
         node-version:
-          - '16'
+          - '18'
     steps:
       # Install deps and cache
       - name: Checkout code
@@ -20,14 +20,14 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
-          cache: yarn
-      - name: Install Yarn dependencies
-        run: yarn install --prefer-offline --frozen-lockfile
+          cache: npm
+      - name: Install NPM dependencies
+        run: npm clean-install --prefer-offline --frozen-lockfile
 
       # Run tests
       - name: Run linter
-        run: yarn docs:lint
+        run: npm run docs:lint
       - name: Test build
         env: 
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: yarn docs:build
+        run: npm run docs:build
diff --git a/.github/workflows/pr-drupal-tests.yml b/.github/workflows/pr-drupal-tests.yml
@@ -12,16 +12,15 @@ jobs:
       ACQUIA_API_SECRET: ${{ secrets.ACQUIA_API_SECRET }}
       RUN_ID: ${{ github.sha }}${{ github.run_id }}${{ github.run_number }}
     strategy:
-      fail-fast: false
       matrix:
-        leia-test:
-          - examples/drupal
+        leia-tests:
+          - drupal
         lando-version:
-          - 3-dev
+          - 3-dev-slim
         os:
           - ubuntu-22.04
         node-version:
-          - '16'
+          - '18'
 
     steps:
       # Install deps and cache
@@ -31,25 +30,27 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
-          registry-url: https://registry.npmjs.org
-          cache: yarn
-      - name: Install Yarn dependencies
-        run: yarn install --prefer-offline --frozen-lockfile
+          cache: npm
+      - name: Install NPM dependencies
+        run: npm clean-install --prefer-offline --frozen-lockfile
+      - name: Bundle Deps
+        uses: lando/prepare-release-action@v2
+        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 }}
           config: |
-            plugins.@lando/acquia=/home/runner/work/acquia/acquia
+            setup.skipCommonPlugins=true
+            setup.plugins.@lando/acquia=/home/runner/work/acquia/acquia
           telemetry: false
-      - name: Verify Lando works and we are dogfooding this plugin for tests
-        run: |
-          lando version
-          lando config --path plugins | grep acquia | grep /home/runner/work/acquia/acquia || (echo "::error:: Not dogfooding this plugin correctly!" && exit 1)
       - name: Run Leia Tests
         uses: lando/run-leia-action@v2
         with:
-          leia-test: "./${{ matrix.leia-test }}/README.md"
+          leia-test: "./examples/${{ matrix.leia-tests }}/README.md"
           cleanup-header: "Destroy tests"
           shell: bash
           stdin: true
diff --git a/.github/workflows/pr-linter.yml b/.github/workflows/pr-linter.yml
@@ -11,7 +11,7 @@ jobs:
         os:
           - ubuntu-22.04
         node-version:
-          - '16'
+          - '18'
     steps:
       # Install deps and cache
       - name: Checkout code
@@ -20,10 +20,10 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
-          cache: yarn
-      - name: Install Yarn dependencies
-        run: yarn install --prefer-offline --frozen-lockfile
+          cache: npm
+      - name: Install NPM dependencies
+        run: npm clean-install --prefer-offline --frozen-lockfile
 
       # Run the linter
       - name: Run code linter
-        run: yarn lint
+        run: npm run lint
diff --git a/.github/workflows/pr-unit-tests.yml b/.github/workflows/pr-unit-tests.yml
@@ -13,7 +13,7 @@ jobs:
           - ubuntu-22.04
           - macos-12
         node-version:
-          - '16'
+          - '18'
     steps:
       # Install deps and cache
       - name: Checkout code
@@ -22,10 +22,10 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
-          cache: yarn
-      - name: Install Yarn dependencies
-        run: yarn install --prefer-offline --frozen-lockfile
+          cache: npm
+      - name: Install NPM dependencies
+        run: npm clean-install --prefer-offline --frozen-lockfile
 
       # Run unit tests
       - name: Run unit tests
-        run: yarn test:unit
+        run: npm run test:unit
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -17,7 +17,7 @@ jobs:
         os:
           - ubuntu-22.04
         node-version:
-          - '16'
+          - '18'
     steps:
       # Install deps and cache
       - name: Checkout code
@@ -27,19 +27,19 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
           registry-url: https://registry.npmjs.org
-          cache: yarn
-      - name: Install Yarn dependencies
-        run: yarn install --prefer-offline --frozen-lockfile
+          cache: npm
+      - name: Install NPM dependencies
+        run: npm clean-install --prefer-offline --frozen-lockfile
 
       # Let's do tests rq just to make sure we dont push something that is fundamentally broken
       - name: Lint code
-        run: yarn lint
+        run: npm run lint
       - name: Run unit tests
-        run: yarn test:unit
+        run: npm run test:unit
 
       # Prepare release.
       - name: Prepare release
-        uses: lando/prepare-release-action@v2
+        uses: lando/prepare-release-action@v3
         with:
           lando-plugin: true
 

diff --git a/.gitignore b/.gitignore
@@ -39,4 +39,7 @@ coverage/
 _site
 docs/.vuepress/.cache
 docs/.vuepress/.temp
-docs/.vuepress/dist
+docs/.vuepress/dist
+
+# YARN
+yarn.lock
diff --git a/.lando.yml b/.lando.yml
@@ -1,14 +1,14 @@
 name: lando-acquia-plugin
 services:
   node:
-    type: node:14
+    type: node:18
     build:
-      - yarn install
+      - npm install
     scanner: false
     ssl: false
     sslExpose: false
 tooling:
   node:
     service: node
-  yarn:
+  npm:
     service: node
diff --git a/.node-version b/.node-version
@@ -1 +1 @@
-16
+18
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## v1.0.0 - [December 7, 2023](https://github.com/lando/acquia/releases/tag/v1.0.0)
+    * Dialed fully for `lando update`
+
 ## v0.10.0 - [October 5, 2023](https://github.com/lando/acquia/releases/tag/v0.10.0)
 * Added a "wait for user" script to ensure user is loaded before cloning repo. [lando/core#71](https://github.com/lando/core/pull/71)