From 928ebc69da48f5910bf73ddc46d91615d9e964e0 Mon Sep 17 00:00:00 2001 From: Alec Reynolds Date: Mon, 9 Sep 2024 11:56:56 -0700 Subject: [PATCH 1/3] Update setup-lando to v3, ubuntu-24.04, and 3-edge-slim. Introduce new .lando.yml template for docs. --- .github/workflows/pr-docs-tests.yml | 2 +- .github/workflows/pr-linter.yml | 2 +- .github/workflows/pr-mysql-tests.yml | 6 +++--- .github/workflows/pr-unit-tests.yml | 2 +- .github/workflows/release.yml | 2 +- .lando.yml | 28 +++++++++++++++++++--------- 6 files changed, 26 insertions(+), 16 deletions(-) diff --git a/.github/workflows/pr-docs-tests.yml b/.github/workflows/pr-docs-tests.yml index 55b51b6..c09818d 100644 --- a/.github/workflows/pr-docs-tests.yml +++ b/.github/workflows/pr-docs-tests.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-linter.yml b/.github/workflows/pr-linter.yml index 5efea1b..61f92d9 100644 --- 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-mysql-tests.yml b/.github/workflows/pr-mysql-tests.yml index 282ecd1..8d7940c 100644 --- a/.github/workflows/pr-mysql-tests.yml +++ b/.github/workflows/pr-mysql-tests.yml @@ -12,11 +12,11 @@ jobs: fail-fast: false matrix: os: - - ubuntu-22.04 + - ubuntu-24.04 node-version: - '18' lando-version: - - 3-dev-slim + - 3-edge-slim leia-test: - examples/5.7 - examples/8.0 @@ -39,7 +39,7 @@ jobs: version: dev sync: false - name: Setup lando ${{ matrix.lando-version }} - uses: lando/setup-lando@v2 + uses: lando/setup-lando@v3 with: lando-version: ${{ matrix.lando-version }} config: | diff --git a/.github/workflows/pr-unit-tests.yml b/.github/workflows/pr-unit-tests.yml index ab22d06..9a3bfe6 100644 --- a/.github/workflows/pr-unit-tests.yml +++ b/.github/workflows/pr-unit-tests.yml @@ -10,7 +10,7 @@ jobs: matrix: os: - windows-2022 - - ubuntu-22.04 + - ubuntu-24.04 - macos-12 node-version: - '18' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fae9684..fa0060b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,7 @@ jobs: strategy: matrix: os: - - ubuntu-22.04 + - ubuntu-24.04 node-version: - '18' steps: diff --git a/.lando.yml b/.lando.yml index f1fbc84..c492708 100644 --- a/.lando.yml +++ b/.lando.yml @@ -1,14 +1,24 @@ -name: lando-mysql-plugin +name: docs.mysql +proxy: + cli: + - docs.mysql.lndo.site:5173 services: - node: - type: node:18 - build: - - npm install + cli: + api: 4 + image: node:18 + command: sleep infinity + ports: + - 5173:5173/http scanner: false - ssl: false - sslExpose: false + user: node + build: + app: | + npm install tooling: node: - service: node + service: cli npm: - service: node + service: cli + vitepress: + service: cli + cmd: npx vitepress From b4555c0d98cb5db69f438245faea5c1d1561f1d3 Mon Sep 17 00:00:00 2001 From: Alec Reynolds Date: Mon, 9 Sep 2024 12:12:58 -0700 Subject: [PATCH 2/3] Add newline to config.mjs --- docs/.vitepress/config.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/.vitepress/config.mjs b/docs/.vitepress/config.mjs index 9939e8a..95b4226 100644 --- a/docs/.vitepress/config.mjs +++ b/docs/.vitepress/config.mjs @@ -53,4 +53,4 @@ function sidebar() { ], }, ]; -}; \ No newline at end of file +}; From 2422b11329cf6133b8e2848f4d32e3fab508f99d Mon Sep 17 00:00:00 2001 From: Alec Reynolds Date: Wed, 11 Sep 2024 14:43:43 -0700 Subject: [PATCH 3/3] Replace references to core/v3/lando-service.html to core/v3/services/lando.html --- docs/config.md | 4 ++-- docs/index.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/config.md b/docs/config.md index b4145e2..187ea81 100644 --- a/docs/config.md +++ b/docs/config.md @@ -5,9 +5,9 @@ description: Learn how to configure the Lando MySQL service. # Configuration -Here are the configuration options, set to the default values, for this service. If you are unsure about where this goes or what this means, we *highly recommend* scanning the [services documentation](https://docs.lando.dev/core/v3/lando-service.html) to get a good handle on how the magicks work. +Here are the configuration options, set to the default values, for this service. If you are unsure about where this goes or what this means, we *highly recommend* scanning the [services documentation](https://docs.lando.dev/core/v3/services/lando.html) to get a good handle on how the magicks work. -Also note that options, in addition to the [build steps](https://docs.lando.dev/core/v3/lando-service.html#build-steps) and [overrides](https://docs.lando.dev/core/v3/lando-service.html#overrides) that are available to every service, are shown below: +Also note that options, in addition to the [build steps](https://docs.lando.dev/core/v3/services/lando.html#build-steps) and [overrides](https://docs.lando.dev/core/v3/services/lando.html#overrides) that are available to every service, are shown below: ::: warning Be careful when switching database type, version or credentials! You should be careful switching database `type`, `version` or `creds`. diff --git a/docs/index.md b/docs/index.md index 029950b..33c6409 100644 --- a/docs/index.md +++ b/docs/index.md @@ -8,7 +8,7 @@ next: ./config.html [MySQL](https://www.mysql.com/) is a very common database server. -You can easily add it to your Lando app by adding an entry to the [services](https://docs.lando.dev/core/v3/lando-service.html) top-level config in your [Landofile](https://docs.lando.dev/core/v3). +You can easily add it to your Lando app by adding an entry to the [services](https://docs.lando.dev/core/v3/services/lando.html) top-level config in your [Landofile](https://docs.lando.dev/core/v3). ```yaml services: @@ -20,7 +20,7 @@ services: * [8.0](https://hub.docker.com/r/bitnami/mysql) * **[5.7](https://hub.docker.com/r/bitnami/mysql)** **(default)** -* [custom](https://docs.lando.dev/core/v3/lando-service.html#overrides) +* [custom](https://docs.lando.dev/core/v3/services/lando.html#overrides) ## Patch versions