Skip to content

Commit 0c96241

Browse files
authored
Merge pull request #1025 from mikepenz/develop
dev -> main
2 parents da6847f + dffddcd commit 0c96241

File tree

10 files changed

+1822
-1276
lines changed

10 files changed

+1822
-1276
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"features": {
77
"ghcr.io/devcontainers/features/node:1": {},
88
"ghcr.io/devcontainers-contrib/features/typescript:1": {}
9-
}
9+
},
1010

1111
// Features to add to the dev container. More info: https://containers.dev/features.
1212
// "features": {},

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
run: echo "CHANGELOG"
8080

8181
- name: Checkout
82-
uses: actions/checkout@v2
82+
uses: actions/checkout@v3
8383
with:
8484
fetch-depth: 0
8585

@@ -134,7 +134,7 @@ jobs:
134134
runs-on: ubuntu-latest
135135
steps:
136136
- name: Checkout
137-
uses: actions/checkout@v2
137+
uses: actions/checkout@v3
138138

139139
- name: "Build Changelog"
140140
id: github_release

.github/workflows/codeql-analysis.yml

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

4444
steps:
4545
- name: Checkout repository
46-
uses: actions/checkout@v2
46+
uses: actions/checkout@v3
4747

4848
# Initializes the CodeQL tools for scanning.
4949
- name: Initialize CodeQL

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ The action supports flexible configuration options to modify vast areas of its b
197197

198198
> **Note** It is possible to provide the configuration as file and as json via the yml file. The order of config values used: `configurationJson` > `configuration` > `DefaultConfiguration`.
199199

200-
This configuration is a `JSON` in the following format. (The below shocases *example* configurations for all possible options. In most scenarios most of the settings will not be needed, and the defaults will be appropiate.)
200+
This configuration is a `JSON` in the following format. (The below showcases *example* configurations for all possible options. In most scenarios most of the settings will not be needed, and the defaults will be appropiate.)
201201

202202
```json
203203
{

__tests__/releaseNotes.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ it('Should ignore PRs not merged into develop branch', async () => {
232232

233233
const changeLog = await releaseNotes.pull()
234234
console.log(changeLog)
235-
expect(changeLog).toStrictEqual(`\n\n150\n\n`)
235+
expect(changeLog).toStrictEqual(`150\n\n`)
236236
})
237237

238238
it('Should ignore PRs not merged into main branch', async () => {
@@ -253,5 +253,5 @@ it('Should ignore PRs not merged into main branch', async () => {
253253

254254
const changeLog = await releaseNotes.pull()
255255
console.log(changeLog)
256-
expect(changeLog).toStrictEqual(`\n\n153\n\n`)
256+
expect(changeLog).toStrictEqual(`153\n\n`)
257257
})

0 commit comments

Comments
 (0)