Skip to content

Commit 78379c7

Browse files
committed
Merge branch 'dev' into releases/v4
2 parents 9e7ec1e + 52f022e commit 78379c7

File tree

8 files changed

+216
-159
lines changed

8 files changed

+216
-159
lines changed

.github/workflows/label.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
if: github.event.pull_request.merged == false
1616
steps:
1717
- name: Checkout 🛎️
18-
uses: actions/checkout@v3
18+
uses: actions/checkout@v4
1919

2020
- name: Assign Labels 🏷️
2121
id: action-assign-labels
@@ -35,7 +35,7 @@ jobs:
3535
nouns: ['BREAKING CHANGE', 'BREAKING', 'MAJOR']
3636
labels: ['breaking 💥']
3737
- type: 'documentation'
38-
nouns: ['doc', 'docu', 'document', 'documentation']
38+
nouns: ['doc', 'docu', 'docs', 'document', 'documentation']
3939
labels: ['documentation 📖']
4040
- type: 'build'
4141
nouns: ['build', 'rebuild']

.github/workflows/sponsors.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ jobs:
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;'
20-
maximum: 4999
20+
maximum: 2499
2121
active-only: false
2222

2323
- name: Generate Sponsors 💖
2424
uses: JamesIves/github-sponsors-readme-action@v1
2525
with:
2626
token: ${{ secrets.PAT }}
2727
file: 'README.md'
28-
minimum: 5000
28+
minimum: 2500
2929
template: '<a href="https://github.com/{{{ login }}}"><img src="https://github.com/{{{ login }}}.png" width="80px" alt="{{{ login }}}" /></a>&nbsp;&nbsp;'
3030
marker: 'premium'
3131
active-only: false

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Maintenance of this project is made possible by all the <a href="https://github.
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/MattWillFlood"><img src="https://github.com/MattWillFlood.png" width="50px" alt="MattWillFlood" /></a>&nbsp;&nbsp;<a href="https://github.com/jonathan-milan-pollock"><img src="https://github.com/jonathan-milan-pollock.png" width="50px" alt="jonathan-milan-pollock" /></a>&nbsp;&nbsp;<a href="https://github.com/raoulvdberge"><img src="https://github.com/raoulvdberge.png" width="50px" alt="raoulvdberge" /></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;<a href="https://github.com/planetoftheweb"><img src="https://github.com/planetoftheweb.png" width="50px" alt="planetoftheweb" /></a>&nbsp;&nbsp;<a href="https://github.com/melton1968"><img src="https://github.com/melton1968.png" width="50px" alt="melton1968" /></a>&nbsp;&nbsp;<a href="https://github.com/szepeviktor"><img src="https://github.com/szepeviktor.png" width="50px" alt="szepeviktor" /></a>&nbsp;&nbsp;<a href="https://github.com/sckott"><img src="https://github.com/sckott.png" width="50px" alt="sckott" /></a>&nbsp;&nbsp;<a href="https://github.com/provinzkraut"><img src="https://github.com/provinzkraut.png" width="50px" alt="provinzkraut" /></a>&nbsp;&nbsp;<a href="https://github.com/electrovir"><img src="https://github.com/electrovir.png" width="50px" alt="electrovir" /></a>&nbsp;&nbsp;<a href="https://github.com/Griefed"><img src="https://github.com/Griefed.png" width="50px" alt="Griefed" /></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/MattWillFlood"><img src="https://github.com/MattWillFlood.png" width="50px" alt="MattWillFlood" /></a>&nbsp;&nbsp;<a href="https://github.com/jonathan-milan-pollock"><img src="https://github.com/jonathan-milan-pollock.png" width="50px" alt="jonathan-milan-pollock" /></a>&nbsp;&nbsp;<a href="https://github.com/raoulvdberge"><img src="https://github.com/raoulvdberge.png" width="50px" alt="raoulvdberge" /></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;<a href="https://github.com/planetoftheweb"><img src="https://github.com/planetoftheweb.png" width="50px" alt="planetoftheweb" /></a>&nbsp;&nbsp;<a href="https://github.com/melton1968"><img src="https://github.com/melton1968.png" width="50px" alt="melton1968" /></a>&nbsp;&nbsp;<a href="https://github.com/szepeviktor"><img src="https://github.com/szepeviktor.png" width="50px" alt="szepeviktor" /></a>&nbsp;&nbsp;<a href="https://github.com/sckott"><img src="https://github.com/sckott.png" width="50px" alt="sckott" /></a>&nbsp;&nbsp;<a href="https://github.com/provinzkraut"><img src="https://github.com/provinzkraut.png" width="50px" alt="provinzkraut" /></a>&nbsp;&nbsp;<a href="https://github.com/electrovir"><img src="https://github.com/electrovir.png" width="50px" alt="electrovir" /></a>&nbsp;&nbsp;<a href="https://github.com/Griefed"><img src="https://github.com/Griefed.png" width="50px" alt="Griefed" /></a>&nbsp;&nbsp;<a href="https://github.com/MontezumaIves"><img src="https://github.com/MontezumaIves.png" width="50px" alt="MontezumaIves" /></a>&nbsp;&nbsp;<!-- sponsors -->
5151
</p>
5252

5353
## Getting Started :airplane:

package.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -44,18 +44,18 @@
4444
},
4545
"devDependencies": {
4646
"@types/jest": "29.5.12",
47-
"@types/node": "20.14.9",
48-
"@typescript-eslint/eslint-plugin": "7.15.0",
49-
"@typescript-eslint/parser": "7.15.0",
50-
"eslint": "9.6.0",
47+
"@types/node": "20.14.11",
48+
"@typescript-eslint/eslint-plugin": "7.16.1",
49+
"@typescript-eslint/parser": "7.16.1",
50+
"eslint": "9.7.0",
5151
"eslint-config-prettier": "9.1.0",
5252
"eslint-plugin-jest": "28.6.0",
53-
"eslint-plugin-prettier": "5.1.3",
53+
"eslint-plugin-prettier": "5.2.1",
5454
"jest": "29.7.0",
5555
"jest-circus": "29.7.0",
56-
"prettier": "3.3.2",
57-
"rimraf": "5.0.7",
58-
"ts-jest": "29.1.5",
56+
"prettier": "3.3.3",
57+
"rimraf": "6.0.1",
58+
"ts-jest": "29.2.3",
5959
"typescript": "5.5.3"
6060
}
6161
}

src/constants.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ import {isNullOrUndefined, stripProtocolFromUrl} from './util'
44

55
const {pusher, repository} = github.context.payload
66

7-
/* Flags to signal different scenarios to test cases */
7+
/*
8+
* Flags to signal different scenarios to test cases
9+
*/
810
export enum TestFlag {
911
NONE = 0,
1012
HAS_CHANGED_FILES = 1 << 1, // Assume changes to commit.

src/lib.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {exportVariable, info, notice, setFailed, setOutput} from '@actions/core'
2-
import {ActionInterface, NodeActionInterface, Status} from './constants'
2+
import {action, ActionInterface, NodeActionInterface, Status} from './constants'
33
import {deploy, init} from './git'
44
import {configureSSH} from './ssh'
55
import {
@@ -11,12 +11,11 @@ import {
1111
isNullOrUndefined
1212
} from './util'
1313

14-
/** Initializes and runs the action.
15-
*
16-
* @param {object} configuration - The action configuration.
14+
/**
15+
* Initializes and runs the action.
1716
*/
1817
export default async function run(
19-
configuration: ActionInterface | NodeActionInterface
18+
configuration?: ActionInterface | NodeActionInterface
2019
): Promise<void> {
2120
let status: Status = Status.RUNNING
2221

@@ -51,6 +50,7 @@ export default async function run(
5150
info('Checking configuration and starting deployment… 🚦')
5251

5352
const settings: ActionInterface = {
53+
...action,
5454
...configuration,
5555
// Set the default branch for Node configurations
5656
branch: !isNullOrUndefined(configuration.branch)

src/main.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import {action} from './constants'
21
import run from './lib'
32

4-
// Runs the action within the GitHub actions environment.
5-
run(action)
3+
run()

0 commit comments

Comments
 (0)