Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/minimist-and-lando/l…
Browse files Browse the repository at this point in the history
…eia--removed
  • Loading branch information
reynoldsalec authored Sep 12, 2024
2 parents 6a53e77 + 39918a7 commit 0122602
Show file tree
Hide file tree
Showing 14 changed files with 286 additions and 198 deletions.
23 changes: 23 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
### Bare minimum self-checks

> [What do you think of a person who only does the bare minimum?](https://getyarn.io/yarn-clip/dcf80710-425e-478b-bde1-c107bd11e849)
- [ ] I've updated this PR with the latest code from `main`
- [ ] I've done a cursory QA pass of my code locally
- [ ] I've ensured all automated status check and tests pass
- [ ] I've [connected this PR to an issue](https://help.zenhub.com/support/solutions/articles/43000010350-connecting-pull-requests-to-github-issues)

### Pieces of flare

- [ ] I've written a unit or functional test for my code
- [ ] I've updated relevant documentation it my code changes it
- [ ] I've updated this repo's README if my code changes it
- [ ] I've updated this repo's CHANGELOG with my change unless its a trivial change (like updating a typo in the docs)

### Finally

- [ ] I've [requested a review](https://help.github.com/en/articles/requesting-a-pull-request-review) with relevant people

If you have any issues or need help please join the `#contributors` channel in the [Lando slack](https://www.launchpass.com/devwithlando) and someone will gladly help you out!

You can also check out the [coder guide](https://docs.lando.dev/contrib/coder.html).
19 changes: 19 additions & 0 deletions .github/workflows/label-add-to-project.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Add to Contrib Project

on:
issues:
types: [labeled]
pull_request:
types: [labeled]

jobs:
add_to_project:
runs-on: ubuntu-latest
steps:
- name: Add issue/PR to GitHub Project
if: github.event.label.name == 'flag'
uses: actions/[email protected]
with:
project-url: https://github.com/orgs/lando/projects/7
github-token: ${{ secrets.SHADOW_COUNCIL_ESCALATOR }}
labeled: flag
2 changes: 1 addition & 1 deletion .github/workflows/pr-docs-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
matrix:
os:
- ubuntu-22.04
- ubuntu-24.04
node-version:
- '18'
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
matrix:
os:
- ubuntu-22.04
- ubuntu-24.04
node-version:
- '18'
steps:
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/pr-redis-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,15 @@ jobs:
strategy:
matrix:
leia-test:
- examples/2.x
- examples/4.x
- examples/5.x
- examples/6.x
- examples/7.x
- examples/custom
lando-version:
- 3-dev-slim
- 3-edge-slim
os:
- ubuntu-22.04
- ubuntu-24.04
node-version:
- '18'
steps:
Expand All @@ -36,7 +35,7 @@ jobs:
- name: Install NPM dependencies
run: npm clean-install --production --prefer-offline --frozen-lockfile
- name: Setup lando ${{ matrix.lando-version }}
uses: lando/setup-lando@v2
uses: lando/setup-lando@v3
with:
lando-version: ${{ matrix.lando-version }}
config: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
matrix:
os:
- windows-2022
- ubuntu-22.04
- ubuntu-24.04
- macos-12
node-version:
- '18'
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
matrix:
os:
- ubuntu-22.04
- ubuntu-24.04
node-version:
- '18'
steps:
Expand All @@ -42,6 +42,9 @@ jobs:
uses: lando/prepare-release-action@v3
with:
lando-plugin: true
sync-email: [email protected]
sync-token: ${{ secrets.RTFM47_COAXIUM_INJECTOR }}
sync-username: rtfm-47

# Deploy
- name: Publish to npm
Expand Down
28 changes: 19 additions & 9 deletions .lando.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,24 @@
name: lando-redis-plugin
name: docs.redis
proxy:
cli:
- docs.redis.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
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@ If you'd like to report a bug or submit a feature request then please [use the i
We try to log all changes big and small in both [THE CHANGELOG](https://github.com/lando/redis/blob/main/CHANGELOG.md) and the [release notes](https://github.com/lando/redis/releases).
## Maintainers
* [@pirog](https://github.com/pirog)
* [@reynoldsalec](https://github.com/reynoldsalec)
## Contributors
<a href="https://github.com/lando/redis/graphs/contributors">
Expand Down
2 changes: 1 addition & 1 deletion docs/.vitepress/config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ function sidebar() {
{text: 'GitHub', link: 'https://github.com/lando/redis/issues/new/choose'},
{text: 'Slack', link: 'https://www.launchpass.com/devwithlando'},
{text: 'Contact Us', link: '/support'},
{text: 'Examples', link: 'https://github.com/lando/redis/tree/main/examples'},
],
},
{text: 'Examples', link: 'https://github.com/lando/redis/tree/main/examples'},
];
};
6 changes: 3 additions & 3 deletions docs/config.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ description: Learn how to configure the Lando Redis 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 the below options are 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.
Also note that the below options are 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.

```yaml
services:
Expand Down Expand Up @@ -67,7 +67,7 @@ Do not use this option if you use a custom `redis.conf` that defines a default u

## Using a custom redis.conf

You may need to override our [default redis server config](https://github.com/lando/redis/tree/main/builders) with your own [custom redis config file](https://redis.io/docs/management/config/).
You may need to override our [default redis server config](https://github.com/lando/redis/tree/main/builders) with your own [custom redis config file](https://redis.io/docs/latest/operate/oss_and_stack/management/config/).

If you do this, you must use a file that exists inside your application and express it relative to your project root as shown below:

Expand Down
4 changes: 2 additions & 2 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ next: ./config.html

[Redis](https://redis.io/) is an open source, in-memory and typed data structure store, used as a database, cache and message broker.

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:
Expand All @@ -27,7 +27,7 @@ services:
* [4](https://hub.docker.com/_/redis)
* [4.0](https://hub.docker.com/_/redis)
* [2.8](https://hub.docker.com/_/redis)
* [custom](https://docs.lando.dev/core/v3/lando-service.html#overrides)
* [custom](https://docs.lando.dev/core/v3/services/lando.html#overrides)
## Patch versions
Expand Down
Loading

0 comments on commit 0122602

Please sign in to comment.