Skip to content

Commit

Permalink
Merge branch 'main' of github.com:XIVStats/lodestone into develop
Browse files Browse the repository at this point in the history
* 'main' of github.com:XIVStats/lodestone:
  chore(release): 0.1.8 (#17)
  fix(ci): enable automerge for dependabot prs
  fix(ci): disable jest report step for dependavot

� Conflicts:
�	docs/api/classes/client_LodestoneClient.default.md
  • Loading branch information
ReidWeb committed Jan 17, 2022
2 parents 1c582e7 + b8664d5 commit 6898739
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 4 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ name: Build, Test & Lint
# Controls when the workflow will run
on:
push:
branches:
- main
- develop
pull_request:

# Allows you to run this workflow manually from the Actions tab
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Changelog

## [0.1.8](https://github.com/XIVStats/lodestone/compare/v0.1.7...v0.1.8) (2021-09-20)


### Bug Fixes

* **ci:** disable jest report step for dependavot ([7cb038f](https://github.com/XIVStats/lodestone/commit/7cb038ffa25058ce54ac7cdc19abb89d9905e248))
* **ci:** enable automerge for dependabot prs ([8c5f824](https://github.com/XIVStats/lodestone/commit/8c5f82485e206c0f20ac214f227dacd1d6a75a92))

## [0.1.7](https://github.com/XIVStats/lodestone/compare/v0.1.6...v0.1.7) (2021-09-20)


Expand Down
2 changes: 1 addition & 1 deletion docs/api/classes/client_LodestoneClient.default.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ Client for interfacing with the Final Fantasy XIV Lodestone.

#### Defined in

[client/LodestoneClient.ts:50](https://github.com/XIVStats/lodestone/blob/286fdf9/src/client/LodestoneClient.ts#L50)
[client/LodestoneClient.ts:50](https://github.com/XIVStats/lodestone/blob/1c582e7/src/client/LodestoneClient.ts#L50)
2 changes: 1 addition & 1 deletion docs/api/modules/locale.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ Square Enix labelling - eu=en, na=enUs, de=de, fr=fr, jp=ja

#### Defined in

[locale/type/OptionalPerLanguageMapping.ts:37](https://github.com/XIVStats/lodestone/blob/286fdf9/src/locale/type/OptionalPerLanguageMapping.ts#L37)
[locale/type/OptionalPerLanguageMapping.ts:37](https://github.com/XIVStats/lodestone/blob/1c582e7/src/locale/type/OptionalPerLanguageMapping.ts#L37)
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@xivstats/lodestone",
"version": "0.1.7",
"version": "0.1.8",
"description": "Module for pulling character profiles from the Final Fantasy XIV Lodestone",
"main": "lib/index.js",
"files": [
Expand Down

0 comments on commit 6898739

Please sign in to comment.