Skip to content

Commit

Permalink
prep for hyperdrive (#12)
Browse files Browse the repository at this point in the history
* prep for hyperdrive

* prep for hyperdrive part 2

* prep for hyperdrive part 3
  • Loading branch information
pirog authored Sep 7, 2022
1 parent 01f68ae commit 7987fe5
Show file tree
Hide file tree
Showing 11 changed files with 44 additions and 36 deletions.
18 changes: 4 additions & 14 deletions .github/workflows/pr-apache-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,28 +16,18 @@ jobs:
lando-versions:
- edge
os:
- ubuntu-20.04
- ubuntu-22.04
node-version:
- '14'
- '16'
steps:
# Install deps and cache
# Eventually it would be great if these steps could live in a separate YAML file
# that could be included in line to avoid code duplication
- name: Checkout code
uses: actions/checkout@v2
- name: Install node ${{ matrix.node-version }}
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
- name: Get Yarn cache directory
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"
- name: Use Yarn cache
uses: actions/cache@v2
id: yarn-cache
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ matrix.node-version }}-${{ hashFiles('**/yarn.lock') }}
registry-url: https://registry.npmjs.org
cache: yarn
- name: Install Yarn dependencies
run: yarn install --prefer-offline --frozen-lockfile

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-docs-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ jobs:
strategy:
matrix:
os:
- ubuntu-20.04
- ubuntu-22.04
node-version:
- '14'
- '16'
steps:
# Install deps and cache
- name: Checkout code
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ jobs:
strategy:
matrix:
os:
- ubuntu-20.04
- ubuntu-22.04
node-version:
- '14'
- '16'
steps:
# Install deps and cache
- name: Checkout code
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pr-unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ jobs:
strategy:
matrix:
os:
- windows-2019
- ubuntu-20.04
- macos-10.15
- windows-2022
- ubuntu-22.04
- macos-12
node-version:
- '14'
- '16'
steps:
# Install deps and cache
- name: Checkout code
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ jobs:
strategy:
matrix:
os:
- ubuntu-20.04
- ubuntu-22.04
node-version:
- '14'
- '16'
steps:
# Install deps and cache
- name: Checkout code
Expand Down
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
14.17.6
16
1 change: 0 additions & 1 deletion .tool-versions

This file was deleted.

6 changes: 4 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
## IN DEVELOPMENT
## v0.6.0 - [September 7, 2022](https://github.com/lando/apache/releases/tag/v0.6.0)

## v0.5.0 - [November 9, 2021](https://github.com/lando/plugin-template/releases/tag/v0.5.0)
* Hyperdrived

## v0.5.0 - [November 9, 2021](https://github.com/lando/apache/releases/tag/v0.5.0)

Lando is **free** and **open source** software that relies on contributions from developers like you! If you like Lando then help us spend more time making, updating and supporting it by [contributing](https://github.com/sponsors/lando).

Expand Down
18 changes: 18 additions & 0 deletions docs/development.md
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,24 @@ Now open a pull request and the new tests should run!

For a deeper dive on Leia you can go [here](https://github.com/lando/leia).

## Releasing

To deploy and publish a new version of the package to the `npm` registry you need only [create a release on GitHub](https://docs.github.com/en/repositories/releasing-projects-on-github/managing-releases-in-a-repository). That said, in order to create a release and succesfully publish it to `npm` you will want to make sure:

* You have tagged the commit you want to deploy in `git` and pushed it up to GitHub
* You have bumped the version in your `package.json` so that it doesn't collide with a version already published to `npm`

In order to help with the above we recommend you run the convience command `yarn release` which will take care of both.

Also note that if you create a "pre-release" it will tag the `npm` package with `edge` instead of the default `latest` tag. Also note that while you can toggle the pre-release checkbox after the initial release creation this will not trigger a new release and/or promote the release from `edge` to `latest`. If you want to deploy to `latest` then create a new release without pre-released checked.

```bash
# Will pull the most recent GitHub release
yarn add @lando/apache
# Will pull the most recent GitHub pre-release
yarn add @lando/apache@edge
```

## Contribution

If you want to contribute code then just follow [this flow](https://guides.github.com/introduction/flow/).
13 changes: 6 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@
"name": "@lando/apache",
"description": "A Lando plugin that provides a tight integration with Apache.",
"version": "0.5.2",
"author": "John Ouellet @labboy0276",
"author": "Mike Pirog @pirog",
"license": "GPL-3.0",
"repository": "lando/apache",
"bugs": "https://github.com/lando/apache/issues/new/choose",
"homepage": "https://github.com/lando/apache",
"keywords": [
"lando",
"lando-service",
"lando-plugin",
"apache"
],
"engines": {
"node": ">=14.0.0"
},
"lando": {
"packageManager": "yarn"
"node": ">=16.0.0"
},
"bundledDependencies": true,
"lando": {},
"main": "index.js",
"nyc": {
"include": [
Expand All @@ -44,7 +44,6 @@
"test": "yarn lint && yarn test:unit"
},
"dependencies": {
"js-yaml": "^3.4.6",
"lodash": "^4.17.21"
},
"devDependencies": {
Expand All @@ -61,4 +60,4 @@
"version-bump-prompt": "^4.2.1",
"vuepress": "^2.0.0-beta.43"
}
}
}
2 changes: 1 addition & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2798,7 +2798,7 @@ js-yaml@4.1.0, js-yaml@^4.1.0:
dependencies:
argparse "^2.0.1"

js-yaml@^3.13.1, js-yaml@^3.4.6:
js-yaml@^3.13.1:
version "3.14.1"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
Expand Down

0 comments on commit 7987fe5

Please sign in to comment.