Skip to content

Commit 29753bd

Browse files
committed
Merge branch 'dev' into releases/v2
2 parents 559826e + 5d3e98e commit 29753bd

File tree

12 files changed

+625
-485
lines changed

12 files changed

+625
-485
lines changed

.github/ISSUE_TEMPLATE/BUG_REPORT.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,22 @@
22
name: Bug Report
33
about: Create a bug report to help us improve the action.
44
labels:
5-
- bug
5+
- triage ⚠️
66
---
77

88
<!-- Please check the Q&A before posting an issue: https://github.com/JamesIves/fetch-api-data-action/discussions/categories/q-a -->
99

1010
## Describe the bug
11-
1211
<!-- Please provide a clear and concise description of what the bug is. -->
1312

1413
## Reproduction Steps
15-
1614
<!-- Steps to reproduce the behavior. -->
1715

1816
## Logs
17+
<!-- Please provide your deployment logs. If the error message isn't revealing the problem please set ACTIONS_STEP_DEBUG to true in your repository's secrets menu and run the workflow again. -->
1918

20-
<!-- Please provide your deployment logs and a link or sample to/of your workflow. If the error message isn't revealing the problem please set ACTIONS_STEP_DEBUG to true in your repository's secrets menu and run the workflow again. -->
19+
## Workflow
20+
<!-- Please provide a link or snippet of your workflow yml file. -->
2121

2222
## Additional Comments
23-
2423
<!--Add any other context about the problem here. -->

.github/dependabot.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,10 @@ updates:
66
interval: daily
77
time: '10:00'
88
open-pull-requests-limit: 10
9+
10+
- package-ecosystem: github-actions
11+
directory: '/'
12+
schedule:
13+
interval: daily
14+
time: '10:00'
15+
open-pull-requests-limit: 10

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Checkout
18-
uses: actions/checkout@v1
18+
uses: actions/checkout@v2.4.0
1919

20-
- uses: actions/setup-node@v1.4.4
20+
- uses: actions/setup-node@v2.5.1
2121
with:
2222
node-version: 'v14.18.1'
2323
registry-url: 'https://registry.npmjs.org'
@@ -32,6 +32,6 @@ jobs:
3232
yarn test
3333
3434
- name: Uploade CodeCov Report
35-
uses: codecov/codecov-action@v1
35+
uses: codecov/codecov-action@v2.1.0
3636
with:
3737
token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
steps:
2121
- name: Checkout repository
22-
uses: actions/checkout@v2
22+
uses: actions/checkout@v2.4.0
2323

2424
- name: Initialize CodeQL
2525
uses: github/codeql-action/init@v1

.github/workflows/integration.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
name: integration-tests
22
on:
3+
workflow_dispatch:
4+
inputs:
5+
branch:
6+
description: 'Specifies the branch which the integration tests should run on.'
7+
required: true
8+
default: 'releases/v2'
39
schedule:
410
- cron: 25 17 * * 0-6
511
push:
@@ -12,7 +18,7 @@ jobs:
1218
runs-on: ubuntu-latest
1319
steps:
1420
- name: Checkout 🛎️
15-
uses: actions/checkout@v2
21+
uses: actions/checkout@v2.4.0
1622
with:
1723
persist-credentials: false
1824

@@ -25,7 +31,7 @@ jobs:
2531
retry: true
2632

2733
- name: Build and Deploy Repo 🚀
28-
uses: JamesIves/github-pages-deploy-action@4.1.7
34+
uses: JamesIves/github-pages-deploy-action@4.2.0
2935
with:
3036
branch: gh-pages
3137
folder: fetch-api-data-custom

.github/workflows/production.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@v2
17+
uses: actions/checkout@v2.4.0
1818

19-
- uses: actions/setup-node@v1.4.4
19+
- uses: actions/setup-node@v2.5.1
2020
with:
2121
node-version: 'v14.18.1'
2222
registry-url: 'https://registry.npmjs.org'

.github/workflows/publish.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ jobs:
1010
build:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v2.4.0
1414
with:
1515
ref: dev
1616

1717
# Setup .npmrc file to publish to npm
18-
- uses: actions/setup-node@v1.4.4
18+
- uses: actions/setup-node@v2.5.1
1919
with:
20-
node-version: '10.15.1'
20+
node-version: 'v14.18.1'
2121
registry-url: 'https://registry.npmjs.org'
2222
scope: '@jamesives'
2323

@@ -40,7 +40,7 @@ jobs:
4040
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
4141

4242
# Setup .npmrc file to publish to GitHub Packages
43-
- uses: actions/setup-node@v1.4.4
43+
- uses: actions/setup-node@v2.5.1
4444
with:
4545
node-version: 12
4646
registry-url: 'https://npm.pkg.github.com'

.github/workflows/sponsors.yml

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,26 @@
11
name: publish-sponsors
22
on:
33
workflow_dispatch:
4-
inputs:
5-
branch:
6-
description: 'Specifies the branch which the sponsors should be generated on.'
7-
required: true
8-
default: 'dev'
94
schedule:
105
- cron: 30 15 * * 0-6
11-
push:
12-
tags-ignore:
13-
- '*.*'
14-
branches:
15-
- releases/v1
166

177
jobs:
188
generate-sponsors:
199
runs-on: ubuntu-latest
2010
steps:
2111
- name: Checkout 🛎️
22-
uses: actions/checkout@v2
12+
uses: actions/checkout@v2.4.0
2313

2414
- name: Generate Sponsors 💖
25-
uses: JamesIves/github-sponsors-readme-action@releases/v1
15+
uses: JamesIves/github-sponsors-readme-action@1.0.7
2616
with:
2717
token: ${{ secrets.PAT }}
28-
marker: 'real-sponsors'
2918
file: 'README.md'
30-
template: '<a href="https://github.com/{{{ login }}}"><img src="https://github.com/{{{ login }}}.png" width="40px" alt="" /></a>'
31-
fallback: '<img src="./github/assets/placeholder.png" width="40px" alt="" />'
32-
minimum: 1000
19+
template: '<a href="https://github.com/{{{ login }}}"><img src="https://github.com/{{{ login }}}.png" width="50px" alt="" /></a>'
20+
minimum: 500
3321

3422
- name: Deploy to GitHub Pages
35-
uses: JamesIves/github-pages-deploy-action@4.1.1
23+
uses: JamesIves/github-pages-deploy-action@4.2.0
3624
with:
37-
branch: ${{ github.event.inputs.branch }}
25+
branch: dev
3826
folder: '.'

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ This <a href="https://github.com/features/actions">GitHub Action</a> will handle
3737
</p>
3838

3939
<p align="center">
40-
This action was originally created for the <a href="https://github.community/t5/Events/Featured-Event-GitHub-Actions-Hackathon/td-p/48206">2020 GitHub Actions Hackathon</a>. You can read about my inspiration for this action <a href="https://jamesiv.es/github/actions/2020/03/07/fetching-authenticated-api-data/">here</a>.
40+
This action was originally created for the <a href="https://github.community/t5/Events/Featured-Event-GitHub-Actions-Hackathon/td-p/48206">2020 GitHub Actions Hackathon</a>. You can read about my inspiration for this action <a href="https://jamesiv.es/blog/github/actions/2020/03/07/fetching-authenticated-api-data/">here</a>.
4141
</p>
4242

4343
<p align="center">
@@ -92,7 +92,7 @@ jobs:
9292
configuration: '{ "method": "GET", "headers": {"Authorization": "Bearer ${{ secrets.API_TOKEN }}"} }'
9393
9494
- name: Build and Deploy 🚀
95-
uses: JamesIves/github-pages-deploy-action@4.1.7
95+
uses: JamesIves/github-pages-deploy-action@4.2.0
9696
with:
9797
branch: main # Pushes the updates to the master branch.
9898
folder: fetch-api-data-action # The location of the data.json file saved by the Fetch API Data action.
@@ -121,7 +121,7 @@ jobs:
121121
npm run-script build
122122
123123
- name: Build and Deploy 🚀
124-
uses: JamesIves/github-pages-deploy-action@4.1.1
124+
uses: JamesIves/github-pages-deploy-action@4.2.0
125125
with:
126126
branch: gh-pages
127127
folder: build
@@ -133,7 +133,7 @@ In your project you can import the JSON file and make it part of your build scri
133133

134134
#### Install as a Node Module 📦
135135

136-
If you'd like to use the functionality provided by this action in your own action you can install it using [yarn](https://yarnpkg.com/) or [npm](https://www.npmjs.com/get-npm) by running the following commands. It's available on both the [npm](https://www.npmjs.com/package/@jamesives/fetch-api-data-action) and [GitHub registry](https://github.com/JamesIves/fetch-api-data-action/packages/229982).
136+
If you'd like to use the functionality provided by this action in your own action you can either [create a composite action](https://docs.github.com/en/actions/creating-actions/creating-a-composite-action), or you can install it using [yarn](https://yarnpkg.com/) or [npm](https://www.npmjs.com/get-npm) by running the following commands. It's available on both the [npm](https://www.npmjs.com/package/@jamesives/fetch-api-data-action) and [GitHub registry](https://github.com/JamesIves/fetch-api-data-action/packages/229982).
137137

138138
```
139139
yarn add @jamesives/fetch-api-data-action

action.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ inputs:
3636
description: 'You can override the name of the exported `.json` file by specifying a new one here. You should _not_ include the file extension in your name.'
3737
required: false
3838

39+
debug:
40+
description: 'If set to true the action will log the API responses it receives in the terminal.'
41+
required: false
42+
3943
outputs:
4044
fetch-api-data:
4145
description: 'The requested data from the API stored as a string.'

package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
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": "1.0.19",
5+
"version": "2.0.0",
66
"license": "MIT",
77
"main": "lib/lib.js",
88
"types": "lib/lib.d.ts",
@@ -41,17 +41,17 @@
4141
},
4242
"devDependencies": {
4343
"@types/async-retry": "1.4.3",
44-
"@types/jest": "27.0.3",
44+
"@types/jest": "27.4.0",
4545
"@types/mustache": "4.1.2",
46-
"@types/node": "17.0.0",
47-
"@typescript-eslint/eslint-plugin": "5.7.0",
48-
"@typescript-eslint/parser": "5.7.0",
49-
"eslint": "8.5.0",
46+
"@types/node": "17.0.8",
47+
"@typescript-eslint/eslint-plugin": "5.9.0",
48+
"@typescript-eslint/parser": "5.9.0",
49+
"eslint": "8.6.0",
5050
"eslint-config-prettier": "8.3.0",
51-
"eslint-plugin-jest": "25.3.0",
51+
"eslint-plugin-jest": "25.3.4",
5252
"eslint-plugin-prettier": "4.0.0",
53-
"jest": "27.4.5",
54-
"jest-circus": "27.4.5",
53+
"jest": "27.4.7",
54+
"jest-circus": "27.4.6",
5555
"nock": "13.2.1",
5656
"prettier": "2.5.1",
5757
"ts-jest": "27.1.2",

0 commit comments

Comments
 (0)