fix not setting git user for commits

README.md

@@ -6,7 +6,7 @@ If a new version exists, it automatically runs `nx migrate latest`, installs all
 ## Usage
 
 The easiest way is to check for new versions with a scheduled workflow. 
-Make sure to checkout the branch you want apply the migrations in case there is a new version of NX.
+Make sure to checkout the branch you want apply the migrations in case there is a new version of NX. The Action will create commits for the applied migrations.
 
 For a detailed description of all parameters check the [action.yml](action.yml).
 
@@ -29,7 +29,6 @@ jobs:
       with:
         repoToken: ${{ secrets.GITHUB_TOKEN }}
         # Optional:
-        commitMessage: 'deps: migrate nx to $VERSION'
         prTitle: 'Migrates NX to $VERSION'
         includeMigrationsFile: false # `migrations.json` will not be included in this PR.
         base: 'dev'

action.yml

@@ -10,10 +10,6 @@ inputs:
     required: false
     description: 'The name of the branch you want the changes pulled into.'
     default: 'main'
-  commitMessage:
-    required: false
-    description: 'Commit Message where $VERSION is the new version of NX.'
-    default: 'migrates NX to $VERSION'
   includeMigrationsFile:
     required: false
     description: 'If false, the migrations.json file will be deleted after running the migrations. It is considered best-practice to check-in the migrations.json.'

dist/index.js

@@ -21210,17 +21210,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.makePRBody = exports.pushChangesToRemote = void 0;
+exports.makePRBody = exports.pushChangesToRemote = exports.prepareGit = void 0;
 const exec_1 = __nccwpck_require__(1514);
-function pushChangesToRemote(commitMessage, repoName, origin) {
+function prepareGit(origin, branchName) {
     return __awaiter(this, void 0, void 0, function* () {
+        yield (0, exec_1.exec)(`git checkout -b ${branchName}`);
         yield (0, exec_1.exec)(`git config --local user.email "github-actions[bot]@users.noreply.github.com"`);
         yield (0, exec_1.exec)(`git config --local user.name "github-actions[bot]"`);
         yield (0, exec_1.exec)(`git remote set-url origin ${origin}`);
-        yield (0, exec_1.exec)(`git checkout -b ${repoName}`);
-        yield (0, exec_1.exec)('git add .');
-        yield (0, exec_1.exec)(`git commit -m "${commitMessage}"`);
-        yield (0, exec_1.exec)(`git push --force-with-lease -u origin ${repoName}`);
+    });
+}
+exports.prepareGit = prepareGit;
+function pushChangesToRemote(branchName) {
+    return __awaiter(this, void 0, void 0, function* () {
+        yield (0, exec_1.exec)(`git push --force-with-lease -u origin ${branchName}`);
     });
 }
 exports.pushChangesToRemote = pushChangesToRemote;
@@ -21277,7 +21280,6 @@ exports.getInputs = void 0;
 const core = __importStar(__nccwpck_require__(2186));
 function getInputs() {
     const repoToken = core.getInput('repoToken', { required: true });
-    const commitMessage = core.getInput('commitMessage', { required: false });
     const includeMigrationsFile = core.getInput('includeMigrationsFile', {
         required: false
     });
@@ -21287,7 +21289,6 @@ function getInputs() {
     const prTitle = core.getInput('prTitle', { required: false });
     return {
         repoToken,
-        commitMessage,
         includeMigrationsFile: Boolean(includeMigrationsFile),
         legacyPeerDeps: Boolean(legacyPeerDeps),
         prTitle
@@ -21371,12 +21372,13 @@ function run() {
                 owner: 'nrwl',
                 repo: 'nx'
             });
+            core.debug('Setting up git user, origin and branch...');
+            const origin = `https://x-access-token:${inputs.repoToken}@github.com/${github.context.repo.owner}/${github.context.repo.repo}`;
+            yield (0, git_1.prepareGit)(origin, branchName);
             core.debug('Starting migrations...');
             yield (0, nx_migrate_1.migrate)(inputs.includeMigrationsFile, inputs.legacyPeerDeps);
             core.debug('Pushing changes...');
-            const commitMessage = inputs.commitMessage.replace('$VERSION', latestNxVersion);
-            const origin = `https://x-access-token:${inputs.repoToken}@github.com/${github.context.repo.owner}/${github.context.repo.repo}`;
-            yield (0, git_1.pushChangesToRemote)(commitMessage, branchName, origin);
+            yield (0, git_1.pushChangesToRemote)(branchName);
             core.info(`Pushed changes to origin/${branchName}`);
             core.debug('Creating Pull Request...');
             const { data: newPr } = yield octokit.rest.pulls.create(Object.assign(Object.assign({}, github.context.repo), { title: inputs.prTitle.replace('$VERSION', latestNxVersion), body: (0, git_1.makePRBody)(latestNxGHRelease.body || 'No release notes', latestNxGHRelease.created_at, latestNxGHRelease.html_url), head: branchName, base: 'main' }));

src/git.ts

@@ -1,21 +1,19 @@
 import {exec} from '@actions/exec'
 
-export async function pushChangesToRemote(
-  commitMessage: string,
-  repoName: string,
-  origin: string
+export async function prepareGit(
+  origin: string,
+  branchName: string
 ): Promise<void> {
+  await exec(`git checkout -b ${branchName}`)
   await exec(
     `git config --local user.email "github-actions[bot]@users.noreply.github.com"`
   )
   await exec(`git config --local user.name "github-actions[bot]"`)
   await exec(`git remote set-url origin ${origin}`)
+}
 
-  await exec(`git checkout -b ${repoName}`)
-  await exec('git add .')
-  await exec(`git commit -m "${commitMessage}"`)
-
-  await exec(`git push --force-with-lease -u origin ${repoName}`)
+export async function pushChangesToRemote(branchName: string): Promise<void> {
+  await exec(`git push --force-with-lease -u origin ${branchName}`)
 }
 
 export function makePRBody(

src/inputs-helper.ts

@@ -3,7 +3,6 @@ import Inputs from './inputs.model'
 
 export function getInputs(): Inputs {
   const repoToken = core.getInput('repoToken', {required: true})
-  const commitMessage = core.getInput('commitMessage', {required: false})
   const includeMigrationsFile = core.getInput('includeMigrationsFile', {
     required: false
   })
@@ -14,7 +13,6 @@ export function getInputs(): Inputs {
 
   return {
     repoToken,
-    commitMessage,
     includeMigrationsFile: Boolean(includeMigrationsFile),
     legacyPeerDeps: Boolean(legacyPeerDeps),
     prTitle

src/inputs.model.ts

@@ -1,6 +1,5 @@
 export default interface Inputs {
   repoToken: string
-  commitMessage: string
   prTitle: string
   includeMigrationsFile: boolean
   legacyPeerDeps: boolean

src/main.ts

@@ -2,7 +2,7 @@ import * as core from '@actions/core'
 import * as github from '@actions/github'
 import {getInputs} from './inputs-helper'
 import {getCurrentNxVersion, getLatestNxVersion} from './nx-version'
-import {makePRBody, pushChangesToRemote} from './git'
+import {makePRBody, prepareGit, pushChangesToRemote} from './git'
 import {migrate} from './nx-migrate'
 
 async function run(): Promise<void> {
@@ -51,16 +51,16 @@ async function run(): Promise<void> {
       }
     )
 
+    core.debug('Setting up git user, origin and branch...')
+    const origin = `https://x-access-token:${inputs.repoToken}@github.com/${github.context.repo.owner}/${github.context.repo.repo}`
+    await prepareGit(origin, branchName)
+
     core.debug('Starting migrations...')
     await migrate(inputs.includeMigrationsFile, inputs.legacyPeerDeps)
 
     core.debug('Pushing changes...')
-    const commitMessage = inputs.commitMessage.replace(
-      '$VERSION',
-      latestNxVersion
-    )
-    const origin = `https://x-access-token:${inputs.repoToken}@github.com/${github.context.repo.owner}/${github.context.repo.repo}`
-    await pushChangesToRemote(commitMessage, branchName, origin)
+
+    await pushChangesToRemote(branchName)
     core.info(`Pushed changes to origin/${branchName}`)
 
     core.debug('Creating Pull Request...')