From 7cb038ffa25058ce54ac7cdc19abb89d9905e248 Mon Sep 17 00:00:00 2001 From: Peter Reid Date: Mon, 20 Sep 2021 22:15:39 +0100 Subject: [PATCH 1/3] fix(ci): disable jest report step for dependavot --- .github/workflows/build.yml | 5 ++++- docs/api/classes/client_LodestoneClient.default.md | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3d5605f..b9bce74 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 @@ -35,7 +38,7 @@ jobs: - name: Test Report uses: dorny/test-reporter@v1 - if: success() || failure() # run this step even if previous step failed + if: github.actor != 'dependabot-bot' && (success() || failure()) # run this step even if previous step failed with: name: JEST Tests # Name of the check run which will be created path: reports/jest-*.xml # Path to test results diff --git a/docs/api/classes/client_LodestoneClient.default.md b/docs/api/classes/client_LodestoneClient.default.md index d1ba9fb..db74f8d 100644 --- a/docs/api/classes/client_LodestoneClient.default.md +++ b/docs/api/classes/client_LodestoneClient.default.md @@ -29,7 +29,7 @@ Client for interfacing with the Final Fantasy XIV Lodestone #### Defined in -[LodestoneClient.ts:53](https://github.com/XIVStats/lodestone/blob/66019f1/src/client/LodestoneClient.ts#L53) +[LodestoneClient.ts:53](https://github.com/XIVStats/lodestone/blob/21e3be7/src/client/LodestoneClient.ts#L53) ## Properties @@ -43,4 +43,4 @@ An instance will be generated by default, but as a consumer you can provide your #### Defined in -[LodestoneClient.ts:49](https://github.com/XIVStats/lodestone/blob/66019f1/src/client/LodestoneClient.ts#L49) +[LodestoneClient.ts:49](https://github.com/XIVStats/lodestone/blob/21e3be7/src/client/LodestoneClient.ts#L49) From 8c5f82485e206c0f20ac214f227dacd1d6a75a92 Mon Sep 17 00:00:00 2001 From: Peter Reid Date: Mon, 20 Sep 2021 22:18:22 +0100 Subject: [PATCH 2/3] fix(ci): enable automerge for dependabot prs --- .github/workflows/automerge.yml | 1 + docs/api/classes/client_LodestoneClient.default.md | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index 25394c8..adde499 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -11,6 +11,7 @@ jobs: contains(github.event.pull_request.labels.*.name, 'pr/auto-approve') && (github.event.pull_request.user.login == 'reidweb-automation' || github.event.pull_request.user.login == 'dependabot[bot]' + || github.event.pull_request.user.login == 'dependabot' || github.event.pull_request.user.login == 'dependabot-preview[bot]') runs-on: ubuntu-latest permissions: diff --git a/docs/api/classes/client_LodestoneClient.default.md b/docs/api/classes/client_LodestoneClient.default.md index db74f8d..6c8b8cc 100644 --- a/docs/api/classes/client_LodestoneClient.default.md +++ b/docs/api/classes/client_LodestoneClient.default.md @@ -29,7 +29,7 @@ Client for interfacing with the Final Fantasy XIV Lodestone #### Defined in -[LodestoneClient.ts:53](https://github.com/XIVStats/lodestone/blob/21e3be7/src/client/LodestoneClient.ts#L53) +[LodestoneClient.ts:53](https://github.com/XIVStats/lodestone/blob/7a945c4/src/client/LodestoneClient.ts#L53) ## Properties @@ -43,4 +43,4 @@ An instance will be generated by default, but as a consumer you can provide your #### Defined in -[LodestoneClient.ts:49](https://github.com/XIVStats/lodestone/blob/21e3be7/src/client/LodestoneClient.ts#L49) +[LodestoneClient.ts:49](https://github.com/XIVStats/lodestone/blob/7a945c4/src/client/LodestoneClient.ts#L49) From b8664d5766924e281ad13c5cfe474eb31daaa2b6 Mon Sep 17 00:00:00 2001 From: ReidWeb Automation Date: Mon, 20 Sep 2021 22:26:09 +0100 Subject: [PATCH 3/3] chore(release): 0.1.8 (#17) Auto-compile changelog, increment package, then auto-merge changes made for v0.1.8 into main. [skip ci] --- CHANGELOG.md | 8 ++++++++ docs/api/classes/client_LodestoneClient.default.md | 4 ++-- package-lock.json | 2 +- package.json | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c43257b..1e2d1b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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) diff --git a/docs/api/classes/client_LodestoneClient.default.md b/docs/api/classes/client_LodestoneClient.default.md index 6c8b8cc..20e9108 100644 --- a/docs/api/classes/client_LodestoneClient.default.md +++ b/docs/api/classes/client_LodestoneClient.default.md @@ -29,7 +29,7 @@ Client for interfacing with the Final Fantasy XIV Lodestone #### Defined in -[LodestoneClient.ts:53](https://github.com/XIVStats/lodestone/blob/7a945c4/src/client/LodestoneClient.ts#L53) +[LodestoneClient.ts:53](https://github.com/XIVStats/lodestone/blob/8c5f824/src/client/LodestoneClient.ts#L53) ## Properties @@ -43,4 +43,4 @@ An instance will be generated by default, but as a consumer you can provide your #### Defined in -[LodestoneClient.ts:49](https://github.com/XIVStats/lodestone/blob/7a945c4/src/client/LodestoneClient.ts#L49) +[LodestoneClient.ts:49](https://github.com/XIVStats/lodestone/blob/8c5f824/src/client/LodestoneClient.ts#L49) diff --git a/package-lock.json b/package-lock.json index f946270..5158f22 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@xivstats/lodestone", - "version": "0.1.7", + "version": "0.1.8", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 479f934..05a5d4a 100644 --- a/package.json +++ b/package.json @@ -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": [