Merge branch 'dev' into releases/v4

JamesIves · Sep 2, 2024 · 2323e01 · 2323e01
2 parents 78379c7 + 739329c
commit 2323e01
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/lib.ts b/src/lib.ts
@@ -51,13 +51,14 @@ export default async function run(
 
  const settings: ActionInterface = {
  ...action,
- ...configuration,
- // Set the default branch for Node configurations
- branch: !isNullOrUndefined(configuration.branch)
- ? configuration.branch
- : 'gh-pages'
+ ...configuration
  }
 
+ // Sets the branch to the default value if it's not defined
+ settings.branch = !isNullOrUndefined(settings.branch)
+ ? settings.branch
+ : 'gh-pages'
+
  // Defines the repository/folder paths and token types.
  // Also verifies that the action has all of the required parameters.
  settings.folderPath = generateFolderPath(settings)