Isolate plugin and add manual yarn deprecation tasks.

lando · Dec 8, 2023 · 61a343f · 61a343f
1 parent 3933d8c
commit 61a343f
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/.github/workflows/pr-phpmyadmin-tests.yml b/.github/workflows/pr-phpmyadmin-tests.yml
@@ -31,17 +31,20 @@ jobs:
           cache: npm
       - name: Install NPM 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 }}
         uses: lando/setup-lando@v2
         with:
           lando-version: ${{ matrix.lando-version }}
           config: |
-            plugins.@lando/phpmyadmin=/home/runner/work/phpmyadmin/phpmyadmin
+            setup.skipCommonPlugins=true
+            setup.plugins.@lando/phpmyadmin=/home/runner/work/phpmyadmin/phpmyadmin
           telemetry: false
-      - name: Verify Lando works and we are dogfooding this plugin for tests
-        run: |
-          lando version
-          lando config --path plugins | grep phpmyadmin | grep /home/runner/work/phpmyadmin/phpmyadmin || (echo "::error:: Not dogfooding this plugin correctly!" && exit 1)
       - name: Run Leia Tests
         uses: lando/run-leia-action@v2
         with:

diff --git a/services/phpmyadmin/builder.js → builders/phpmyadmin.js b/services/phpmyadmin/builder.js → builders/phpmyadmin.js
diff --git a/docs/index.md b/docs/index.md
@@ -40,6 +40,18 @@ This plugin is included with Lando by default. That means if you have Lando vers
 However if you would like to manually install the plugin, update it to the bleeding edge or install a particular version then use the below. Note that this installation method requires Lando `3.5.0+`.
 
 :::: code-group
+::: code-group-item LANDO 3.21+
+```bash:no-line-numbers
+lando plugin-add @lando/phpmyadmin
+```
+:::
+::: code-group-item HYPERDRIVE
+```bash:no-line-numbers
+# @TODO
+# @NOTE: This doesn't actaully work yet
+hyperdrive install @lando/phpmyadmin
+```
+:::
 ::: code-group-item DOCKER
 ```bash:no-line-numbers
 # Ensure you have a global plugins directory
@@ -59,12 +71,6 @@ docker run --rm -it -v ${HOME}/.lando/plugins:/plugins -w /tmp node:18-alpine sh
 lando --clear
 ```
 :::
-::: code-group-item HYPERDRIVE
-```bash:no-line-numbers
-# @TODO
-# @NOTE: This doesn't actaully work yet
-hyperdrive install @lando/phpmyadmin
-```
 ::::
 
 You should be able to verify the plugin is installed by running `lando config --path plugins` and checking for `@lando/phpmyadmin`. This command will also show you _where_ the plugin is being loaded from.