Skip to content

Commit a740a17

Browse files
JoaoPedroAS51JoaoPedroAS51
authored
Merge pull request robsontenorio#137 from robsontenorio/dev
Release v1.7.1
2 parents 22edb37 + 60eabff commit a740a17

File tree

6 files changed

+3603
-73
lines changed

6 files changed

+3603
-73
lines changed

.github/workflows/nodejs.yml renamed to .github/workflows/test-and-release.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
22
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
33

4-
name: Node.js CI
4+
name: Test and Release
55

66
on:
77
push:
@@ -48,8 +48,8 @@ jobs:
4848
- name: Test
4949
run: yarn test
5050

51-
publish:
52-
name: Publish
51+
release:
52+
name: Release
5353

5454
needs: test
5555

@@ -85,16 +85,16 @@ jobs:
8585
with:
8686
directory: ./coverage
8787

88-
- name: Publish to NPM
89-
uses: mikeal/merge-release@master
88+
- name: Release
89+
run: yarn semantic-release
9090
env:
9191
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
92-
NPM_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
92+
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
9393

9494
docs:
9595
name: Documentation
9696

97-
needs: test
97+
needs: release
9898

9999
runs-on: ${{ matrix.os }}
100100

‎.releaserc‎

Whitespace-only changes.

‎docs/content/en/community/contributing.md‎

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
---
2+
title: Contributing
3+
description: 'Contributing to this package.'
4+
position: 12
5+
category: Community
6+
---
7+
8+
## Commit Guidelines
9+
10+
We use [Angular Commit Message Conventions](https://docs.google.com/document/d/1QrDFcIiPjSLDn3EL15IJygNPiHORgU1_OOAqWjiDU5Y/edit).
11+
12+
### Commit Message Format
13+
Each commit message consists of a **header**, a **body** and a **footer**. The header has a special
14+
format that includes a **type**, a **scope** and a **subject**:
15+
16+
```
17+
<type>(<scope>): <subject>
18+
<BLANK LINE>
19+
<body>
20+
<BLANK LINE>
21+
<footer>
22+
```
23+
24+
The **header** is mandatory and the **scope** of the header is optional.
25+
26+
Any line of the commit message cannot be longer than 100 characters! This allows the message to be easier
27+
to read on GitHub as well as in various git tools.
28+
29+
### Revert
30+
If the commit reverts a previous commit, it should begin with `revert: `, followed by the header
31+
of the reverted commit.
32+
In the body it should say: `This reverts commit <hash>.`, where the hash is the SHA of the commit
33+
being reverted.
34+
35+
### Type
36+
Must be one of the following:
37+
38+
- **feat**: A new feature
39+
- **fix**: A bug fix
40+
- **docs**: Documentation only changes
41+
- **style**: Changes that do not affect the meaning of the code (white-space, formatting, missing
42+
semi-colons, etc)
43+
- **refactor**: A code change that neither fixes a bug nor adds a feature
44+
- **perf**: A code change that improves performance
45+
- **test**: Adding missing or correcting existing tests
46+
- **ci**: Changes to continuous integration.
47+
- **chore**: Changes to the build process or auxiliary tools and libraries such as documentation
48+
generation
49+
50+
### Scope
51+
The scope could be anything specifying place of the commit change. For example `model`,
52+
`builder`, `parser`, etc...
53+
54+
You can use `*` when the change affects more than a single scope.
55+
56+
### Subject
57+
The subject contains succinct description of the change:
58+
59+
* use the imperative, present tense: "change" not "changed" nor "changes"
60+
* don't capitalize first letter
61+
* no dot (.) at the end
62+
63+
### Body
64+
Just as in the **subject**, use the imperative, present tense: "change" not "changed" nor "changes".
65+
The body should include the motivation for the change and contrast this with previous behavior.
66+
67+
### Footer
68+
The footer should contain any information about **Breaking Changes** and is also the place to
69+
[reference GitHub issues that this commit closes][closing-issues].
70+
71+
**Breaking Changes** should start with the word `BREAKING CHANGE:` with a space or two newlines.
72+
The rest of the commit message is then used for this.
73+
74+
## Branches
75+
76+
### `dev`
77+
78+
The `dev` branch is the default branch of the package. PR's should be based on it.
79+
80+
### `master`
81+
82+
The `master` branch is a protected branch and is only used for releases.
83+
84+
<alert type="danger">Do not commit directly to this branch. Use `dev` branch instead.</alert>
85+
86+
## Releasing a New Version
87+
88+
In order to release a new version, a new PR from `dev` branch must be opened and merged into the `master` branch.
89+
90+
**Github Action** will automatically make a release using
91+
[semantic-release](https://github.com/semantic-release/semantic-release).
92+
93+
94+
| Commit message | Release type |
95+
|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------|
96+
| `fix(pencil): stop graphite breaking when too much pressure applied` | Patch Release |
97+
| `feat(pencil): add 'graphiteWidth' option` | ~~Minor~~ Feature Release |
98+
| `perf(pencil): remove graphiteWidth option`<br><br>`BREAKING CHANGE: The graphiteWidth option has been removed.`<br>`The default graphite width of 10mm is always used for performance reasons.` | ~~Major~~ Breaking Release |
99+
100+
## Deploying Documentation
101+
102+
Documentation changes must be based on `dev` branch.
103+
104+
**Github Action** will automatically
105+
deploy the documentation when a new version is released.
106+

‎docs/content/en/performing-operations.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ We can update a `Comment` of a **Post**:
270270

271271
```js
272272
const post = await Post.find(1)
273-
const comment = await post.comments().attach({
273+
const comment = await post.comments().sync({
274274
text: 'Awesome post!'
275275
})
276276
```

‎package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vue-api-query",
3-
"version": "1.6.1",
3+
"version": "0.0.0-development",
44
"description": "💎 Elegant and simple way to build requests for REST API",
55
"main": "build/index.js",
66
"scripts": {
@@ -57,6 +57,7 @@
5757
"babel-eslint": "^10.1.0",
5858
"codecov": "^3.6.5",
5959
"eslint": "^6.8.0",
60-
"jest": "^24.1.0"
60+
"jest": "^24.1.0",
61+
"semantic-release": "^17.2.2"
6162
}
6263
}

0 commit comments

Comments
 (0)