Skip to content

Commit 9f282b1

Browse files
committed
Merge branch 'dev' into releases/v2
2 parents 3b49449 + dae5d46 commit 9f282b1

File tree

9 files changed

+168
-158
lines changed

9 files changed

+168
-158
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,11 @@ jobs:
2828
- name: Install and Test
2929
run: |
3030
yarn install --frozen-lockfile
31-
yarn lint
31+
yarn lint:check
32+
yarn lint:format:check
3233
yarn test
3334
3435
- name: Uploade CodeCov Report
35-
uses: codecov/codecov-action@v2.1.0
36+
uses: codecov/codecov-action@v3.1.0
3637
with:
3738
token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
uses: actions/checkout@v3
2323

2424
- name: Initialize CodeQL
25-
uses: github/codeql-action/init@v1
25+
uses: github/codeql-action/init@v2
2626

2727
- name: Autobuild
28-
uses: github/codeql-action/autobuild@v1
28+
uses: github/codeql-action/autobuild@v2
2929

3030
- name: Perform CodeQL Analysis
31-
uses: github/codeql-action/analyze@v1
31+
uses: github/codeql-action/analyze@v2

.github/workflows/integration.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
retry: true
3232

3333
- name: Build and Deploy Repo 🚀
34-
uses: JamesIves/github-pages-deploy-action@v4.2.5
34+
uses: JamesIves/github-pages-deploy-action@v4
3535
with:
3636
branch: gh-pages
3737
folder: fetch-api-data-custom
@@ -68,7 +68,7 @@ jobs:
6868
retry: true
6969

7070
- name: Build and Deploy Repo 🚀
71-
uses: JamesIves/github-pages-deploy-action@v4.2.5
71+
uses: JamesIves/github-pages-deploy-action@v4
7272
with:
7373
branch: gh-pages
7474
folder: fetch-api-data-custom-encoding

.github/workflows/sponsors.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,26 @@ jobs:
1212
uses: actions/checkout@v3
1313

1414
- name: Generate Sponsors 💖
15-
uses: JamesIves/github-sponsors-readme-action@v1.0.8
15+
uses: JamesIves/github-sponsors-readme-action@v1
1616
with:
1717
token: ${{ secrets.PAT }}
1818
file: 'README.md'
1919
template: '<a href="https://github.com/{{{ login }}}"><img src="https://github.com/{{{ login }}}.png" width="50px" alt="{{{ login }}}" /></a>&nbsp;&nbsp;'
2020
maximum: 9999
21+
organization: true
2122

2223
- name: Generate Sponsors 💖
23-
uses: JamesIves/github-sponsors-readme-action@v1.0.8
24+
uses: JamesIves/github-sponsors-readme-action@v1
2425
with:
2526
token: ${{ secrets.PAT }}
2627
file: 'README.md'
2728
minimum: 10000
2829
template: '<a href="https://github.com/{{{ login }}}"><img src="https://github.com/{{{ login }}}.png" width="80px" alt="{{{ login }}}" /></a>&nbsp;&nbsp;'
2930
marker: 'premium'
31+
organization: true
3032

3133
- name: Deploy to GitHub Pages
32-
uses: JamesIves/github-pages-deploy-action@v4.2.5
34+
uses: JamesIves/github-pages-deploy-action@v4
3335
with:
3436
branch: dev
3537
folder: '.'

.prettierignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Ignore artifacts:
2+
build
3+
coverage
4+
lib
5+
fetch-api-data-action
6+
fetch-api-data-custom

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ When contributing to this repository, please first discuss the change you wish t
99
2. Ensure your change passes all of the integration tests.
1010
3. Make sure you update the README if you've made a change that requires documentation.
1111
4. When making a pull request, highlight any areas that may cause a breaking change so the maintainer can update the version number accordingly on the GitHub marketplace and package registries.
12-
5. Make sure you've formatted and linted your code. You can do this by running `yarn format` and `yarn lint`.
12+
5. Make sure you've linted and formatted your code. You can do this by running `yarn lint` and `yarn lint:format`.
1313
6. Fix or add any tests where applicable. You can run `yarn test` to run the suite. As this action is small in scope it's important that a high level of test coverage is maintained. All tests are written using [Jest](https://jestjs.io/).
1414
7. As this package is written in [TypeScript](https://www.typescriptlang.org/) please ensure all typing is accurate and the action compiles correctly by running `yarn build`.
1515

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@
4343
</p>
4444

4545
<p align="center">
46-
<!-- premium --><!-- premium -->
46+
<!-- premium --><a href="https://github.com/github"><img src="https://github.com/github.png" width="80px" alt="github" /></a>&nbsp;&nbsp;<!-- premium -->
4747
</p>
4848

4949
<p align="center">
50-
<!-- sponsors --><a href="https://github.com/Chooksta69"><img src="https://github.com/Chooksta69.png" width="50px" alt="Chooksta69" /></a>&nbsp;&nbsp;<a href="https://github.com/milanpollock"><img src="https://github.com/milanpollock.png" width="50px" alt="milanpollock" /></a>&nbsp;&nbsp;<a href="https://github.com/robjtede"><img src="https://github.com/robjtede.png" width="50px" alt="robjtede" /></a>&nbsp;&nbsp;<!-- sponsors -->
50+
<!-- sponsors --><a href="https://github.com/Chooksta69"><img src="https://github.com/Chooksta69.png" width="50px" alt="Chooksta69" /></a>&nbsp;&nbsp;<a href="https://github.com/robjtede"><img src="https://github.com/robjtede.png" width="50px" alt="robjtede" /></a>&nbsp;&nbsp;<a href="https://github.com/hadley"><img src="https://github.com/hadley.png" width="50px" alt="hadley" /></a>&nbsp;&nbsp;<a href="https://github.com/kevinchalet"><img src="https://github.com/kevinchalet.png" width="50px" alt="kevinchalet" /></a>&nbsp;&nbsp;<a href="https://github.com/Yousazoe"><img src="https://github.com/Yousazoe.png" width="50px" alt="Yousazoe" /></a>&nbsp;&nbsp;<!-- sponsors -->
5151
</p>
5252

5353
## Getting Started ✈️
@@ -62,7 +62,7 @@ jobs:
6262
runs-on: ubuntu-latest
6363
steps:
6464
- name: Fetch API Data 📦
65-
uses: JamesIves/fetch-api-data-action@v2.1.0
65+
uses: JamesIves/fetch-api-data-action@v2
6666
with:
6767
endpoint: https://example.com
6868
configuration: '{ "method": "GET", "headers": {"Authorization": "Bearer ${{ secrets.API_TOKEN }}"} }'
@@ -92,7 +92,7 @@ jobs:
9292
persist-credentials: false
9393
9494
- name: Fetch API Data 📦
95-
uses: JamesIves/fetch-api-data-action@v2.2.2
95+
uses: JamesIves/fetch-api-data-action@v2
9696
with:
9797
endpoint: https://example.com
9898
configuration: '{ "method": "GET", "headers": {"Authorization": "Bearer ${{ secrets.API_TOKEN }}"} }'
@@ -210,7 +210,7 @@ jobs:
210210
runs-on: ubuntu-latest
211211
steps:
212212
- name: Fetch API Data 📦
213-
uses: JamesIves/fetch-api-data-action@v2.2.2
213+
uses: JamesIves/fetch-api-data-action@v2
214214
with:
215215
# The token endpoint is requested first. This retrieves the access token for the other endpoint.
216216
token-endpoint: https://example.com/auth/token

package.json

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,18 @@
22
"name": "@jamesives/fetch-api-data-action",
33
"description": "GitHub action for handling authenticated API requests, allowing you to save the data from the request into your workspace as an environment variable and a .json file.",
44
"author": "James Ives <iam@jamesiv.es> (https://jamesiv.es)",
5-
"version": "2.2.0",
5+
"version": "2.2.2",
66
"license": "MIT",
77
"main": "lib/lib.js",
88
"types": "lib/lib.d.ts",
99
"root": true,
1010
"scripts": {
1111
"build": "rm -rf lib && tsc --declaration",
1212
"test": "jest",
13-
"lint": "eslint src/**/*.ts __tests__/**/*.ts",
14-
"lint:format": "prettier --write './**/*.{ts,js,json,yml,md}' './*.{ts,js,json,yml,md}'"
13+
"lint": "eslint --fix .",
14+
"lint:check": "eslint .",
15+
"lint:format": "prettier --write .",
16+
"lint:format:check": "prettier --check ."
1517
},
1618
"repository": {
1719
"type": "git",
@@ -33,28 +35,28 @@
3335
"github-action"
3436
],
3537
"dependencies": {
36-
"@actions/core": "1.6.0",
37-
"@actions/io": "1.1.1",
38+
"@actions/core": "1.9.0",
39+
"@actions/io": "1.1.2",
3840
"async-retry": "1.3.3",
3941
"cross-fetch": "3.1.5",
4042
"mustache": "4.2.0"
4143
},
4244
"devDependencies": {
4345
"@types/async-retry": "1.4.3",
44-
"@types/jest": "27.4.1",
46+
"@types/jest": "27.5.0",
4547
"@types/mustache": "4.1.2",
46-
"@types/node": "17.0.21",
47-
"@typescript-eslint/eslint-plugin": "5.13.0",
48-
"@typescript-eslint/parser": "5.13.0",
49-
"eslint": "8.10.0",
48+
"@types/node": "18.0.0",
49+
"@typescript-eslint/eslint-plugin": "5.20.0",
50+
"@typescript-eslint/parser": "5.20.0",
51+
"eslint": "8.18.0",
5052
"eslint-config-prettier": "8.5.0",
51-
"eslint-plugin-jest": "26.1.1",
53+
"eslint-plugin-jest": "26.5.3",
5254
"eslint-plugin-prettier": "4.0.0",
5355
"jest": "27.5.1",
5456
"jest-circus": "27.5.1",
5557
"nock": "13.2.4",
56-
"prettier": "2.5.1",
57-
"ts-jest": "27.1.3",
58-
"typescript": "4.6.2"
58+
"prettier": "2.7.1",
59+
"ts-jest": "27.1.4",
60+
"typescript": "4.7.4"
5961
}
6062
}

0 commit comments

Comments
 (0)