Skip to content

Commit 2323e01

Browse files
committed
Merge branch 'dev' into releases/v4
2 parents 78379c7 + 739329c commit 2323e01

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

src/lib.ts

+6-5
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,14 @@ export default async function run(
5151

5252
const settings: ActionInterface = {
5353
...action,
54-
...configuration,
55-
// Set the default branch for Node configurations
56-
branch: !isNullOrUndefined(configuration.branch)
57-
? configuration.branch
58-
: 'gh-pages'
54+
...configuration
5955
}
6056

57+
// Sets the branch to the default value if it's not defined
58+
settings.branch = !isNullOrUndefined(settings.branch)
59+
? settings.branch
60+
: 'gh-pages'
61+
6162
// Defines the repository/folder paths and token types.
6263
// Also verifies that the action has all of the required parameters.
6364
settings.folderPath = generateFolderPath(settings)

0 commit comments

Comments
 (0)