From ff71a30fac17804bad40aefb5ac998cb23fa4cb5 Mon Sep 17 00:00:00 2001 From: Alec Reynolds Date: Mon, 9 Sep 2024 11:56:33 -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-memcached-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-memcached-tests.yml b/.github/workflows/pr-memcached-tests.yml index 46ef93b..1196fed 100644 --- a/.github/workflows/pr-memcached-tests.yml +++ b/.github/workflows/pr-memcached-tests.yml @@ -15,9 +15,9 @@ jobs: - examples/1.x - examples/custom lando-version: - - 3-dev-slim + - 3-edge-slim os: - - ubuntu-22.04 + - ubuntu-24.04 node-version: - '18' steps: @@ -38,7 +38,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 4c670a9..67c1ffd 100644 --- a/.github/workflows/pr-unit-tests.yml +++ b/.github/workflows/pr-unit-tests.yml @@ -11,7 +11,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 6ce4897..38f31d6 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 4ef994b..ed606e1 100644 --- a/.lando.yml +++ b/.lando.yml @@ -1,14 +1,24 @@ -name: lando-memcached-plugin +name: docs.memcached +proxy: + cli: + - docs.memcached.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 eab2bd31f463cee39437b0f9a1b4b9a9c6ba25eb Mon Sep 17 00:00:00 2001 From: Alec Reynolds Date: Mon, 9 Sep 2024 12:12:46 -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 7aed33c..be85c21 100644 --- a/docs/.vitepress/config.mjs +++ b/docs/.vitepress/config.mjs @@ -53,4 +53,4 @@ function sidebar() { ], }, ]; -}; \ No newline at end of file +}; From fb3f7d373d1da907e6cf5c0fe36e11bbf0816ea6 Mon Sep 17 00:00:00 2001 From: Alec Reynolds Date: Wed, 11 Sep 2024 14:43:32 -0700 Subject: [PATCH 3/3] Replace references to core/v3/lando-service.html to core/v3/services/lando.html --- docs/config.md | 6 +++--- docs/index.md | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/config.md b/docs/config.md index 62786b8..f692600 100644 --- a/docs/config.md +++ b/docs/config.md @@ -5,9 +5,9 @@ description: Learn how to configure the Lando Memcached 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: ```yaml services: @@ -45,4 +45,4 @@ services: ## Getting information -You can get connection and credential information about your memcached instance by running [`lando info`](https://docs.lando.dev/cli/info.html). It may also be worth checking out our [accessing services externally guide](https://docs.lando.dev/guides/external-access.html). \ No newline at end of file +You can get connection and credential information about your memcached instance by running [`lando info`](https://docs.lando.dev/cli/info.html). It may also be worth checking out our [accessing services externally guide](https://docs.lando.dev/guides/external-access.html). diff --git a/docs/index.md b/docs/index.md index c6a84c6..835cf88 100644 --- a/docs/index.md +++ b/docs/index.md @@ -8,7 +8,7 @@ next: ./config.html [Memcached](https://memcached.org/) is an in-memory key-value store for small chunks of arbitrary data (strings, objects) from results of database calls, API calls, or page rendering. -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: @@ -21,7 +21,7 @@ services: * **[1](https://hub.docker.com/r/bitnami/memcached)** **(default)** * [1.5.12](https://hub.docker.com/r/bitnami/memcached) * [1.5.x](https://hub.docker.com/r/bitnami/memcached) -* [custom](https://docs.lando.dev/core/v3/lando-service.html#overrides) +* [custom](https://docs.lando.dev/core/v3/services/lando.html#overrides) ## Patch versions